compilation fix

[wxWidgets.git] / samples / controls / makefile.dos

diff --git a/samples/controls/makefile.dos b/samples/controls/makefile.dos
index 81466d023dfbe1ecb2317b69508c7e3235d7ae3c..f1170311a5ae3019c2797495c5cd8b61c666e663 100644 (file)
--- a/samples/controls/makefile.dos
+++ b/samples/controls/makefile.dos
@@ -1,65 +1,17 @@
 #
 # File:                makefile.dos
 # Author:      Julian Smart
 #
 # File:                makefile.dos
 # Author:      Julian Smart

-# Created:     1993
+# Created:     1998

 # Updated:     
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh

 #
 #

-# "%W% %G%"
-#
-# Makefile : Builds controls example (DOS).
+# Makefile : Builds 16-bit sample, VC++ 1.5

 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
 WXDIR = $(WXWIN)
 
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
 WXDIR = $(WXWIN)
 

-!include $(WXDIR)\src\makemsc.env
-
-THISDIR = $(WXDIR)\samples\controls
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-HEADERS =
-SOURCES = controls.$(SRCSUFF)
-OBJECTS = controls.obj
-
-all:    controls.exe
-
-wx:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(THISDIR)
-
-wxclean:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.dos clean
-        cd $(THISDIR)
-
-controls.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) controls.obj controls.def controls.res
-        link $(LINKFLAGS) @<<
-controls.obj $(WXDIR)\src\msw\dummy.obj,
-controls,
-NUL,
-$(LIBS),
-controls.def
-;
-<<
-        rc -K controls.res
-
-controls.obj:      controls.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
+TARGET=controls
+OBJECTS=$(TARGET).obj

 
 

-controls.res :      controls.rc $(WXDIR)\include\wx\msw\wx.rc
-    rc -r /i$(WXDIR)\include controls
+!include $(WXDIR)\src\makeprog.msc

 
 

-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb