fix some more samples for digital mars [allow contrib to work]

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

diff --git a/contrib/samples/svg/makefile.sc b/contrib/samples/svg/makefile.sc
new file mode 100644 (file)
index 0000000..a67b4ee
--- /dev/null
+++ b/contrib/samples/svg/makefile.sc
@@ -0,0 +1,6 @@
+#Digital Mars (was Symantec) C++ makefile 
+WXDIR = ..\..\..
+EXTRALIBS=svg_sc
+TARGET=svgtest
+OBJECTS = $(TARGET).obj 
+include $(WXDIR)\src\makeprog.sc

diff --git a/contrib/src/svg/makefile.sc b/contrib/src/svg/makefile.sc
new file mode 100644 (file)
index 0000000..a701142
--- /dev/null
+++ b/contrib/src/svg/makefile.sc
@@ -0,0 +1,20 @@
+##############################################################################
+# Name:                        src/zlib/makefile.sc
+# Purpose:             build zlib Digital Mars 8.33 compiler
+# Author:              Chris Elliott
+# Created:             21.01.03
+# RCS-ID:              $Id$
+# Licence:             wxWindows licence
+##############################################################################
+
+WXDIR = ..\..\..
+include $(WXDIR)\src\makesc.env
+LIBTARGET=$(WXDIR)\lib\svg$(SC_SUFFIX).lib
+THISDIR=$(WXDIR)\contrib\src\svg
+
+# variables
+OBJECTS = \
+        $(THISDIR)\dcsvg.obj 
+
+include $(WXDIR)\src\makelib.sc
+

diff --git a/samples/svg/makefile.sc b/samples/svg/makefile.sc
new file mode 100644 (file)
index 0000000..a67b4ee
--- /dev/null
+++ b/samples/svg/makefile.sc
@@ -0,0 +1,6 @@
+#Digital Mars (was Symantec) C++ makefile 
+WXDIR = ..\..\..
+EXTRALIBS=svg_sc
+TARGET=svgtest
+OBJECTS = $(TARGET).obj 
+include $(WXDIR)\src\makeprog.sc

diff --git a/src/makeprog.sc b/src/makeprog.sc
index bf3b951c791b0d2a3e92fe4f4c80ba294fdde778..165c33ca60e96fdd41b3b73d8721c3e92c7f727b 100644 (file)
--- a/src/makeprog.sc
+++ b/src/makeprog.sc
@@ -7,7 +7,7 @@ INCLUDE=$(INCDIR)
 include $(WXDIR)\src\makesc.env
 
 $(TARGET).exe: $(OBJECTS) $(TARGET).res
-       link $(LDFLAGS) /DELEXECUTABLE /RC  $(OBJECTS), $@, $*, $(LIBDIR)\ $(LIBS)
+       link $(LDFLAGS) /DELEXECUTABLE /RC -L/exet:nt/su:windows $(OBJECTS), $@, $*, $(LIBDIR)\ $(LIBS)
     
 
 clean:

diff --git a/src/makesc.env b/src/makesc.env
index 813b2767c0ad9f89d5e5612b87c85067de4d2efb..607d44e0109401206e4e2784bb33b1e12f71f08e 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -4,6 +4,7 @@ SC_SUFFIX=_sc
 
 ####WXDIR = $(WXWIN)
 INCDIR = $(WXDIR)\include
+CONTRIBINCDIR = $(WXDIR)\contrib\include
 MSWINCDIR = $(WXDIR)\include\wx\msw
 ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
 LIBDIR = $(WXDIR)\lib
@@ -15,7 +16,7 @@ SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX)
 SRCSUFF = cpp
 OBJSUFF = obj
 
-INCLUDE=-I$(INCDIR) -I$(ARCHINCDIR) -I$(WXDIR)/src/regex;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
+INCLUDE=-I$(INCDIR) -I$(ARCHINCDIR) -I$(CONTRIBINCDIR) -I$(WXDIR)/src/regex;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/tiff
 
 
 
@@ -28,9 +29,10 @@ RC=rcc
 # -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
+# possible bug with putting d on any extralibs if we have debug and release versions one day
 LDFLAGS = $(EXTRALDFLAGS)
 LIBS=$(WXLIB) $(EXTRALIBS) $(SUPPORTLIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid 
-DEFFILE=sc32.def
+
 
 .$(SRCSUFF).obj:
        *$(CC) -c $(CFLAGS) $(INCLUDE) $(OPTIONS) $< -o$@