fixed new charset detection code (langinfo.h not included in intl.cpp; langinfo.h...

[wxWidgets.git] / src / makeprog.vc

diff --git a/src/makeprog.vc b/src/makeprog.vc
index e938d7c78cb54751f747d056fb22c3f6bb2fc471..f33a3f4ad1be1a4947a0248b2ece50fc15b21dde 100644 (file)
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -2,7 +2,7 @@
 # File:                makefile.nt
 # Author:      Julian Smart
 # Created:     1999
-# Updated:     
+# Updated:
 # Copyright:   (c) Julian Smart
 #
 # Makefile environment for building samples. Include this from
@@ -17,6 +17,10 @@ WXUSINGDLL=0
 
 !include $(WXDIR)\src\makevc.env
 
+!if "$(RM)" == ""
+RM= erase
+!endif
+
 all:    $(PROGRAM).exe
 
 wx:
@@ -29,18 +33,41 @@ wxclean:
         nmake -f makefile.vc clean
 #        cd $(THISDIR)
 
-$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) 
+
+!if "$(wxUSE_GUI)" == ""
+wxUSE_GUI=1
+!endif
+
+!if "$(wxUSE_GUI)" == "1" 
+
+$(PROGRAM).exe:      $(WXLIB) $(OBJECTS) $(PROGRAM).res
+       $(link) @<<
+-out:$(PROGRAM).exe
+$(LINKFLAGS)
+$(OBJECTS) $(DUMMYOBJ) $(PROGRAM).res
+$(LIBS)
+<<
+
+$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
+    $(rc) -r /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$@ $(PROGRAM).rc
+
+!else
+
+$(PROGRAM).exe:      $(WXLIB) $(OBJECTS)
        $(link) @<<
 -out:$(PROGRAM).exe
 $(LINKFLAGS)
-$(DUMMYOBJ) $(OBJECTS)
+$(OBJECTS) $(DUMMYOBJ)
 $(LIBS)
 <<
 
+!endif
+
+
 clean:
-        -erase $(OBJECTS)
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb
+        -$(RM) $(OBJECTS)
+        -$(RM) *.exe
+        -$(RM) *.res
+        -$(RM) *.map
+        -$(RM) *.sbr
+        -$(RM) *.pdb