Adding support for item font/style/color customization, unfortunately, it does not...

[wxWidgets.git] / src / makeprog.vc

diff --git a/src/makeprog.vc b/src/makeprog.vc
index 5c17936e4fe70e07c3ebaac92366f3a23d8d37b1..e2c76535c4c6804caccddeca981a1b1b9243fe2c 100644 (file)
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -10,13 +10,19 @@
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 

-# Set WXDIR for your system (hint, set an environment variable named WXWIN)
+# Set WXDIR for your system

 WXDIR = $(WXWIN)
 
 WXDIR = $(WXWIN)
 

+!ifndef WXUSINGDLL

 WXUSINGDLL=0
 WXUSINGDLL=0

+!endif

 
 !include $(WXDIR)\src\makevc.env
 
 
 !include $(WXDIR)\src\makevc.env
 

+!if "$(RM)" == ""
+RM= erase
+!endif
+

 all:    $(PROGRAM).exe
 
 wx:
 all:    $(PROGRAM).exe
 
 wx:


@@ -29,21 +35,45 @@ wxclean:
         nmake -f makefile.vc clean
 #        cd $(THISDIR)
 
         nmake -f makefile.vc clean
 #        cd $(THISDIR)
 

-$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
+
+!if "$(wxUSE_GUI)" == ""
+wxUSE_GUI=1
+!endif
+
+!if "$(wxUSE_GUI)" == "1"
+
+#!if "$(WXUSINGDLL)" == "1"
+DUMMYOBJ=
+#!endif
+
+$(PROGRAM).exe:      $(WXLIB) $(OBJECTS) $(PROGRAM).res

        $(link) @<<
 -out:$(PROGRAM).exe
 $(LINKFLAGS)
        $(link) @<<
 -out:$(PROGRAM).exe
 $(LINKFLAGS)

-$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res
+$(OBJECTS) $(DUMMYOBJ) $(PROGRAM).res

 $(LIBS)
 <<
 
 $(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
 $(LIBS)
 <<
 
 $(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc

-    $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
+    $(rc) -r /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$@ $(PROGRAM).rc
+
+!else
+
+$(PROGRAM).exe:      $(WXLIB) $(OBJECTS)
+       $(link) @<<
+-out:$(PROGRAM).exe
+$(LINKFLAGS)
+$(OBJECTS) $(DUMMYOBJ)
+$(LIBS)
+<<
+
+!endif
+

 
 clean:
 
 clean:

-        -erase $(OBJECTS)
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb
+        -$(RM) *.obj
+        -$(RM) *.exe
+        -$(RM) *.res
+        -$(RM) *.map
+        -$(RM) *.sbr
+        -$(RM) *.pdb