fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / samples / minimal / makefile.sc

diff --git a/samples/minimal/makefile.sc b/samples/minimal/makefile.sc
index c55f65c7d7619bfe4af9e47becf771d54327ab4c..181a939f04960c113225a478f543967a8182141a 100644 (file)
--- a/samples/minimal/makefile.sc
+++ b/samples/minimal/makefile.sc
@@ -1,36 +1,5 @@
-# Symantec C++ makefile
-
-WXDIR = $(WXWIN)
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-INCLUDE=$(INCDIR)
+# Digital Mars / Symantec C++ makefile 
+WXDIR = ..\..

 TARGET=minimal
 TARGET=minimal

-
-include $(WXDIR)\src\makesc.env
-
-minimal.exe: minimal.obj $(DEFFILE) minimal.res
-       *$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-    *$(RC) -k minimal.res
-
-sc32.def:
-     echo EXETYPE NT > sc32.def
-     echo SUBSYSTEM WINDOWS >> sc32.def
-
-sc16.def:
-     echo NAME $(TARGET) > sc16.def
-     echo EXETYPE WINDOWS >> sc16.def
-     echo STUB         'WINSTUB.EXE' >> sc16.def
-     echo CODE         PRELOAD MOVEABLE DISCARDABLE >> sc16.def
-     echo DATA         PRELOAD MOVEABLE MULTIPLE >> sc16.def
-     echo HEAPSIZE     1024 >> sc16.def
-     echo STACKSIZE    8192 >> sc16.def
-
-clean:
-    -del *.obj
-       -del *.exe
-       -del *.res
-       -del *.map
-       -del *.rws
-    -del sc32.def
-    -del sc16.def
-
+OBJECTS = $(TARGET).obj 
+include $(WXDIR)\src\makeprog.sc