Add -m32 and -x c to Makefile for 64-bit Snow Leopard.

[pforth] / build / unix / Makefile

diff --git a/build/unix/Makefile b/build/unix/Makefile
index 2408291..a7dbb5d 100644 (file)
--- a/build/unix/Makefile
+++ b/build/unix/Makefile
@@ -2,7 +2,9 @@
 # Portable Forth written in 'C'
 # by Phil Burk
 # For more info visit http://www.softsynth.com/pforth/
 # Portable Forth written in 'C'
 # by Phil Burk
 # For more info visit http://www.softsynth.com/pforth/

-
+#
+# See "help" target below.
+\r

 .SUFFIXES: .c .o
 
 # Options include: PF_SUPPORT_FP PF_NO_MALLOC PF_NO_INIT PF_DEBUG
 .SUFFIXES: .c .o
 
 # Options include: PF_SUPPORT_FP PF_NO_MALLOC PF_NO_INIT PF_DEBUG


@@ -21,6 +23,9 @@ PFORTHAPP    = $(PFORTHDIR)/pforth_standalone
 OBJECTDIR    = $(PFORTHDIR)/objects
 TEMPOBJECTDIR = $(PFORTHDIR)/tempobjects
 
 OBJECTDIR    = $(PFORTHDIR)/objects
 TEMPOBJECTDIR = $(PFORTHDIR)/tempobjects
 

+# This is needed to get pForth to build on Snow Leopard and other 64 bit platforms.
+WIDTHOPT=-m32
+

 FULL_WARNINGS =  \
         -fsigned-char \
         -fno-builtin \
 FULL_WARNINGS =  \
         -fsigned-char \
         -fno-builtin \


@@ -34,7 +39,8 @@ FULL_WARNINGS =  \
         -Wmissing-prototypes \
         -Wmissing-declarations
         
         -Wmissing-prototypes \
         -Wmissing-declarations
         

-CCOPTS = -DPF_SUPPORT_FP -O2 $(FULL_WARNINGS) $(EXTRA_CCOPTS)
+DEBUGOPTS = -g
+CCOPTS = $(WIDTHOPT) -x c -DPF_SUPPORT_FP -O2 $(FULL_WARNINGS) $(EXTRA_CCOPTS) $(DEBUGOPTS)

 
 IO_SOURCE = ${CSRCDIR}/posix/pf_io_posix.c
 #IO_SOURCE = ${CSRCDIR}/stdio/pf_io_stdio.c
 
 IO_SOURCE = ${CSRCDIR}/posix/pf_io_posix.c
 #IO_SOURCE = ${CSRCDIR}/stdio/pf_io_stdio.c


@@ -80,21 +86,38 @@ ${OBJECTDIR}:
        mkdir -p ${OBJECTDIR}/posix
        mkdir -p ${OBJECTDIR}/stdio
 
        mkdir -p ${OBJECTDIR}/posix
        mkdir -p ${OBJECTDIR}/stdio
 

-# build pforth by compiling 'C' source
+# Build pforth by compiling 'C' source.

 $(PFDICAPP): $(PFINCLUDES) $(PFOBJS)
 $(PFDICAPP): $(PFINCLUDES) $(PFOBJS)

-       $(COMPILER) $(PFOBJS) -lm -o $(PFDICAPP)
-
-pfdicapp: $(PFDICAPP)
+       $(COMPILER) $(PFOBJS) $(WIDTHOPT)  -lm -o $(PFDICAPP)

 
 

-# build basic dictionary by running newly built pforth and including system.fth
+# Build basic dictionary image by running newly built pforth and including "system.fth".

 $(PFDICDAT): $(PFDICAPP)
        cd $(FTHDIR); $(PFDICAPP) -i system.fth ; mv pfdicdat.h $(PFDICDAT)
 
 $(PFDICDAT): $(PFDICAPP)
        cd $(FTHDIR); $(PFDICAPP) -i system.fth ; mv pfdicdat.h $(PFDICDAT)
 

-$(PFORTHAPP): ${TEMPOBJECTDIR} $(PFDICDAT) $(PFINCLUDES) $(PFEMBOBJS)
-       $(COMPILER) $(PFEMBOBJS) -lm -o $(PFORTHAPP)
+$(PFORTHAPP): $(PFDICDAT) $(PFEMBOBJS)
+       $(COMPILER) $(PFEMBOBJS) $(WIDTHOPT) -lm -o $(PFORTHAPP)

        @echo ""
        @echo "Standalone pForth executable written to $(PFORTHAPP)"
        
        @echo ""
        @echo "Standalone pForth executable written to $(PFORTHAPP)"
        

+       
+# target aliases
+pfdicapp: $(PFDICAPP)
+
+pfdicdat: $(PFDICDAT)
+
+pforthapp: $(PFORTHAPP)
+
+help:
+       @echo "Use 'make all' to build standalone pForth executable."
+       @echo "PForth can be built in several stages using these targets:"
+       @echo "   pfdicapp = executable pForth with minimal dictionary. All from 'C'."
+       @echo "   pfdicdat = image of full dictionary build by compiling Forth code."
+       @echo "   pforthapp = executable with embedded dictionary image. DEFAULT 'all' target."
+       @echo ""
+       @echo "   The file 'fth/pfdicdat.h' is generated by pForth. It contains a binary image of the Forth dictionary."
+       @echo "   It allows pForth to work as a standalone image that does not need to load a dictionary file."
+
+

 clean:
        -rm -f $(PFOBJS) $(PFEMBOBJS)
        -rm $(PFORTHAPP)
 clean:
        -rm -f $(PFOBJS) $(PFEMBOBJS)
        -rm $(PFORTHAPP)