From b911bc32a17f592214fcc37bb942ad3f355e6893 Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Fri, 13 Jun 2003 18:39:45 +0000
Subject: [PATCH] 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
---
 src/makeprog.sc | 10 +++-------
 src/makesc.env  |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/makeprog.sc b/src/makeprog.sc
index 3e078c813a..bf3b951c79 100644
--- a/src/makeprog.sc
+++ b/src/makeprog.sc
@@ -6,14 +6,10 @@ INCLUDE=$(INCDIR)
 
 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
@@ -21,7 +17,7 @@ clean:
 	-del *.map
 	-del *.rws
     -del *.sym
-    -del sc16.def
+
 
 cleanexe:
     -del *.exe
diff --git a/src/makesc.env b/src/makesc.env
index 11c7bbe736..813b2767c0 100644
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -35,7 +35,7 @@ DEFFILE=sc32.def
 .$(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$@