use wxDIB object instead of static ConvertFromBitmap() in CF_DIB case

[wxWidgets.git] / src / makeprog.va

diff --git a/src/makeprog.va b/src/makeprog.va
index 6cc7218ea03fe963fb4873c0cce2e3052d20593a..04c72355627b55238e1875e977bb95e7530ed6be 100644 (file)
--- a/src/makeprog.va
+++ b/src/makeprog.va
@@ -10,26 +10,37 @@
 # 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 and environment variable to point to WXDIR for your system
-WXDIR = $(WXWIN)
-
-WXUSINGDLL=0
-
-!include $(WXDIR)\src\makeva.env
+#
+# Define inference rules for compiling C++ files.
+#
+{$(THISDIR)}.cpp{$(OPATH)}.obj:
+    @echo $<
+    icc @<<
+    $(CPPFLAGS) /Fo$@ /Tp $<
+    $(THISDIR)\$(@B).cpp
+<<

 
 

-all:    $(PROGRAM).exe
+all:    $(PROGTARGET)

 
 wx:
         cd $(WXDIR)\src\os2
         nmake -f makefile.va FINAL=$(FINAL)
 
 wx:
         cd $(WXDIR)\src\os2
         nmake -f makefile.va FINAL=$(FINAL)

-#        cd $(THISDIR)
+        cd $(THISDIR)

 
 wxclean:
         cd $(WXDIR)\src\os2
         nmake -f makefile.va clean
 
 wxclean:
         cd $(WXDIR)\src\os2
         nmake -f makefile.va clean

-#        cd $(THISDIR)
+        cd $(THISDIR)
+
+$(PROGRAM).obj:: $(OPATH)\$(PROGRAM).obj
+$(OPATH)\$(PROGRAM).obj: $(THISDIR)\$(PROGRAM).cpp

 
 

-$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
+$(PROGRAM).res:: $(PROGRES)
+$(PROGRES):
+    $(RC) -I $(WXDIR)\include\wx\os2 -D __VISAGECPP__ -r $(PROGRC) $(PROGRES)
+
+$(PROGRAM).exe:: $(PROGTARGET)
+$(PROGTARGET):   $(OBJECTS) $(PROGRES) $(DUMMYOBJ) $(WXLIB)

     @echo " Link::Linker "
     $(LINK) @<<
         /B" $(LINKFLAGS)" /Fe$@
     @echo " Link::Linker "
     $(LINK) @<<
         /B" $(LINKFLAGS)" /Fe$@


@@ -37,15 +48,12 @@ $(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
         $(OBJECTS)
         $(LIBS)
 <<
         $(OBJECTS)
         $(LIBS)
 <<

-  $(RC) $(PROGRAM).res $(PROGRAM).exe
-
-$(PROGRAM).res :      $(PROGRAM).rcO $(WXDIR)\include\wx\os2\wx.rc
-    $(RC) -I $(WXDIR)\include -D __VISAGECPP__ -r $(PROGRAM).rcO $(PROGRAM).res
+  $(RC) $(PROGRES) $(PROGTARGET)

 
 clean:
         -erase $(OBJECTS)
 
 clean:
         -erase $(OBJECTS)

-        -erase *.exe
-        -erase *.obj
-        -erase *.res
-        -erase *.map
+        -erase $(OPATH)\*.exe
+        -erase $(OPATH)\*.obj
+        -erase $(OPATH)\*.res
+        -erase $(OPATH)\*.map