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

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

diff --git a/samples/listctrl/makefile.sc b/samples/listctrl/makefile.sc
index 8709d2ca0feab6db54586290ea227d8369fe1230..2335fe68dde8b35448f25efac2259fc38504d8ae 100644 (file)
--- a/samples/listctrl/makefile.sc
+++ b/samples/listctrl/makefile.sc
@@ -1,35 +1,6 @@
-# Symantec C++ makefile for minimal example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-       *$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-       *$(RC) -r -I$(INCLUDE) $<
-
-minimal.exe: minimal.obj minimal.def minimal.res
-       *$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-       -del *.exe
-       -del *.res
-       -del *.map
-       -del *.rws
+#Digital Mars (was Symantec) C++ makefile 
+WXDIR = ..\..
+EXTRALIBS=
+TARGET=listtest
+OBJECTS = $(TARGET).obj
+include $(WXDIR)\src\makeprog.sc