Much improved wxHelpControllerHtml, works under Solaris, too now.

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

diff --git a/samples/typetest/makefile.dos b/samples/typetest/makefile.dos
index 0c9debf866ee022ea5025f74b5609280c0f16d7e..837e509b02a6e310113f8e90919b6331c825f7f3 100644 (file)
--- a/samples/typetest/makefile.dos
+++ b/samples/typetest/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 typetest 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\typetest
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-HEADERS =
-SOURCES = typetest.$(SRCSUFF)
-OBJECTS = typetest.obj
-
-all:    typetest.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)
-
-typetest.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) typetest.obj typetest.def typetest.res
-        link $(LINKFLAGS) @<<
-typetest.obj $(WXDIR)\src\msw\dummy.obj,
-typetest,
-NUL,
-$(LIBS),
-typetest.def
-;
-<<
-        rc -K typetest.res
-
-typetest.obj:      typetest.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
+TARGET=typetest
+OBJECTS = $(TARGET).obj

 
 

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

 
 

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