update to make digitalmars link minimal sample

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

diff --git a/src/makeprog.sc b/src/makeprog.sc
new file mode 100644 (file)
index 0000000..1e52890
--- /dev/null
+++ b/src/makeprog.sc
@@ -0,0 +1,23 @@
+# Symantec DigitalMars  C++ makefile
+
+WXLIB = $(WXDIR)\lib\wx.lib
+INCDIR = $(WXDIR)\include
+INCLUDE=$(INCDIR)
+
+include $(WXDIR)\src\makesc.env
+
+$(TARGET).exe: $(TARGET).obj $(TARGET).res
+       link $(LDFLAGS) $*, $@, $*, $(LIBS)
+    
+
+sc32.def:
+     echo EXETYPE NT > sc32.def
+     echo SUBSYSTEM WINDOWS >> sc32.def
+
+clean:
+    -del *.obj
+       -del *.exe
+       -del *.res
+       -del *.map
+       -del *.rws
+    -del sc16.def

diff --git a/src/makesc.env b/src/makesc.env
index 064e1cbf0274693d134a4541d892b34b6d3764ed..d7919768af08da2e8972e777602b5203941fdb31 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -1,19 +1,25 @@
 # Common settings for Symantec
+# and digital mars successor (http://www.digitalmars.com)
+SC_SUFFIX=_sc
 
 WXDIR = $(WXWIN)
 INCDIR = $(WXDIR)\include
+MSWINCDIR = $(WXDIR)\include\wx\msw
+ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
 LIBDIR = $(WXDIR)\lib
-WXLIB = $(LIBDIR)\wx.lib
+WXLIB = $(LIBDIR)\wx$(SC_SUFFIX).lib
 
 SRCSUFF = cpp
 OBJSUFF = obj
 
-INCLUDE=$(INCDIR)
+INCLUDE=-I$(INCDIR) -I$(ARCHINCDIR) -I$(WXDIR)/src/regex;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
+
+
 
 # default values
 
-CC=sc
-RC=rc
+CC=dmc
+RC=rcc
 
 # WIN16 settings
 #CFLAGS = -Jm -ml -W -D__WXMSW__ -D__SC__ -D__WXDEBUG__ -D__WINDOWS__ -D__WIN16__ $(EXTRACPPFLAGS)
@@ -23,19 +29,20 @@ RC=rc
 #DEFFILE=sc16.def
 
 # WIN32 settings
-CFLAGS = -o -mn -W -D__NT__ -DWIN32 -D__WIN32__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
-LINKER = link386
-LDFLAGS = -L$(LINKER).exe $(EXTRALDFLAGS)
-LIBS=$(WXLIB) $(EXTRALIBS) ctl3d32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib kernel32.lib winmm.lib
+# -H ... fix to use directory
+CFLAGS = -o -mn -W -H -D__NT__ -DWIN32 -D__WIN32__ -D__WIN95__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
+LINKER = link
+LDFLAGS = /DELEXECUTABLE /RC $(EXTRALDFLAGS)
+LIBS=$(WXLIB) $(EXTRALIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid 
 DEFFILE=sc32.def
 
 .$(SRCSUFF).obj:
-       *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $< -o$@
+       *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) $< -o$@
 
 # -Jm: relaxed type checking
 .c.obj:
-       *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@
+       *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@
 
 .rc.res:
-       *$(RC) -r -I$(INCLUDE) $<
+       *$(RC) -D__NT__ -r $(INCLUDE) $<