fix for dmc compilation of projects with more than one obj

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makeprog.sc b/src/makeprog.sc
index 3e078c813abb1352484f89b6a5064566d4e76077..bf3b951c791b0d2a3e92fe4f4c80ba294fdde778 100644 (file)
--- a/src/makeprog.sc
+++ b/src/makeprog.sc
@@ -6,14 +6,10 @@ INCLUDE=$(INCDIR)
 
 include $(WXDIR)\src\makesc.env
 
 
 include $(WXDIR)\src\makesc.env
 

-$(TARGET).exe: $(TARGET).obj $(TARGET).res
-       link $(LDFLAGS) /DELEXECUTABLE /RC  $*, $@, $*, $(LIBDIR)\ $(LIBS)
+$(TARGET).exe: $(OBJECTS) $(TARGET).res
+       link $(LDFLAGS) /DELEXECUTABLE /RC  $(OBJECTS), $@, $*, $(LIBDIR)\ $(LIBS)

     
 
     
 

-sc32.def:
-     echo EXETYPE NT > sc32.def
-     echo SUBSYSTEM WINDOWS >> sc32.def
-

 clean:
     -del *.obj
        -del *.exe
 clean:
     -del *.obj
        -del *.exe


@@ -21,7 +17,7 @@ clean:
        -del *.map
        -del *.rws
     -del *.sym
        -del *.map
        -del *.rws
     -del *.sym

-    -del sc16.def
+

 
 cleanexe:
     -del *.exe
 
 cleanexe:
     -del *.exe

diff --git a/src/makesc.env b/src/makesc.env
index 11c7bbe7363d01c3d524d555e1d87f034ec219ac..813b2767c0ad9f89d5e5612b87c85067de4d2efb 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -35,7 +35,7 @@ DEFFILE=sc32.def
 .$(SRCSUFF).obj:
        *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) $< -o$@
 
 .$(SRCSUFF).obj:
        *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) $< -o$@
 

-# -Jm: relaxed type checking
+# -Jm: relaxed type checking only for .C files

 .c.obj:
        *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@
 
 .c.obj:
        *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@