added cw6 fixes and patrick's patches

[wxWidgets.git] / src / makeprog.va

diff --git a/src/makeprog.va b/src/makeprog.va
index e76d63ed56487fdbfe47afb7254ebe3d2dbb9098..635f48a2cb44a129ad73106fa4d07e25b52d0697 100644 (file)
--- a/src/makeprog.va
+++ b/src/makeprog.va
@@ -10,13 +10,6 @@
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
-# Set and environment variable to point to WXDIR for your system
-WXDIR = $(WXWIN)
-
-WXUSINGDLL=0
-
-!include $(WXDIR)\src\makeva.env
-
 all:    $(PROGRAM).exe
 
 wx:
@@ -39,8 +32,8 @@ $(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
 <<
   $(RC) $(PROGRAM).res $(PROGRAM).exe
 
-$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\os2\wx.rc
-    $(RC) -I $(WXDIR)\include -D __VISAGECPP__ -r $(PROGRAM).rc $(PROGRAM).res
+$(PROGRAM).res :      $(PROGRAM).rcO $(WXDIR)\include\wx\os2\wx.rc
+    $(RC) -I $(WXDIR)\include -D __VISAGECPP__ -r $(PROGRAM).rcO $(PROGRAM).res
 
 clean:
         -erase $(OBJECTS)