Changeset 427

Timestamp:

Jul 23, 2003, 3:18:54 AM (22 years ago)

Author:

bird

Message:

#564: Build everything with debug info. Removed obsolete options. Added a few hacks.

File:

• trunk/src/emx/Makefile (modified) (6 diffs, 1 prop)

trunk/src/emx/Makefile

@@ -28 +28 @@
 CPU = 386
 # The object file format to use for tools (emxomf, ld and friends)
-TOOLFMT.dbg = aout
+TOOLFMT.dbg = omf
 TOOLFMT.opt = omf
 TOOLFMT = $(TOOLFMT.$(MODE))
@@ -49 +49 @@
 CC = gcc -c -Zmt
 # The C compiler flags
-CFLAGS.INC = -Iinclude -Isrc/include
-CFLAGS = -Wall -mstack-arg-probe $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
+CFLAGS.INC  = -Iinclude -Isrc/include
+CFLAGS      = -Wall -mstack-arg-probe $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
 # The additional C compiler flags for different build modes
-CFLAGS.opt = -s -O3
-CFLAGS.dbg = -g -DDEBUG
+CFLAGS.opt  = -g -O3
+CFLAGS.dbg  = -g -DDEBUG
 CFLAGS.aout =
-CFLAGS.omf = -Zomf
+CFLAGS.omf  = -Zomf
 CFLAGS.prof = -pg
 # The object files are put in subdirectory objectformat-targetkind,
@@ -65 +65 @@
 
 # The linker
-LD = gcc -Zmt
+LD = gcc
 # Linker flags
-LDFLAGS = $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND) -Zstack 1024
+LDFLAGS     = $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND) -Zmap -Zstack 1024
 LDFLAGS.DLL = $(LDFLAGS) -Zdll
 # Linker flags for different build modes
-LDFLAGS.opt = -s -Zcrtdll=c_dll
+LDFLAGS.opt = -g -Zcrtdll=c_dll
 LDFLAGS.dbg = -g
 LDFLAGS.aout =
-LDFLAGS.omf = -Zomf -Zsys -Zlinker /PM:VIO
+LDFLAGS.omf = -Zomf -Zlinker /PM:VIO -Zlinker /LINENUMBERS
 LDFLAGS.prof = -pg
 # Linker flags for different kinds of target
@@ -90 +90 @@
 #               shared, data segment is not shared, but must be reloaded page by page
 #               from the executable in new processes. </rant>
+# URG! we must not do this for ldstub.bin!
 ifeq ($(MODE),opt)
-DO.LINK.exe += $(NL)lxlite /X /AS $@
-DO.LINK.dll += $(NL)lxlite /X /AS $@
+DO.LINK.exe += $(if $(findstring .exe,$@), $(NL)cp $@ $(basename $@).dbg $(NL)lxlite /X /AS $@)
+DO.LINK.dll += $(NL)cp $@ $(basename $@).dbg $(NL)lxlite /X /AS $@
 endif
 
@@ -144 +145 @@
 #       must use the shell.
 EMXOMF = `test -f '$.$(TOOLFMT)/emxomf$E' && echo '$.$(TOOLFMT)/'`emxomf$E
-DO.EMXOMF = $(EMXOMF) $(strip $1 -o) $@ $<
+DO.EMXOMF = $(EMXOMF) $(strip $1 -o) $@ $(if $<,$<, $(subst /omf/,/aout/,$(@:.obj=.o)) )
 
 # How to filter just the object files from $^
@@ -283 +284 @@
 
 # The general a.out -> OMF conversion rule for object files
-$.omf/%.obj:
+$.omf/%.obj:    
         $(call DO.EMXOMF)