Correction for 'protected' compiler error

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

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

 
 

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

 
 

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