Support for building samples in a port, dbg-rlse, dll-stat specifc output path

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/minimal/makefile.va b/samples/minimal/makefile.va
index ba7f61ed13099c87b83317dc8c5393f39dd50794..adffb27a1074a1a6f927f7c4256b2381926f66b1 100644 (file)
--- a/samples/minimal/makefile.va
+++ b/samples/minimal/makefile.va
@@ -9,17 +9,36 @@
 # Use FINAL=1 argument to nmake to build final version with no debug info.
 
 # Set WXDIR for your system
-WXDIR = $(WXWIN)
-
-WXUSINGDLL=0
+WXDIR=$(WXWIN)
 
 !include $(WXDIR)\src\makeva.env
 
-PROGRAM=$D\minimal
-OBJECTS = $(PROGRAM).obj
+#
+# Define which program this is and what it's path is and where to output to
+#
+PROGRAM=minimal
+THISDIR=$(WXWIN)\samples\$(PROGRAM)
+OPATH=$(THISDIR)\$D
 
-!if [md $D]
+#
+# Make sure output directory is available
+#
+!if [md $(OPATH)]
 !endif
 
+#
+# Standard definitions
+#
+PROGRC=$(THISDIR)\$(PROGRAM).rcO
+OBJECTS=$(OPATH)\$(PROGRAM).obj
+PROGRES=$(OPATH)\$(PROGRAM).res
+PROGTARGET=$(OPATH)\$(PROGRAM).exe
+
+.cpp{$OPATH}.obj:
+    @echo $<
+    icc @<<
+$(CPPFLAGS) /Fo$@ /Tp $<
+<<
+
 !include $(WXDIR)\src\makeprog.va
 

diff --git a/src/makeprog.va b/src/makeprog.va
index 635f48a2cb44a129ad73106fa4d07e25b52d0697..7acc3f7b3dbe6a89a386f1b2480a7ba3f84bd8f5 100644 (file)
--- a/src/makeprog.va
+++ b/src/makeprog.va
@@ -10,19 +10,37 @@
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
-all:    $(PROGRAM).exe
+#
+# Define inference rules for compiling C++ files.
+#
+{$(THISDIR)}.cpp{$(OPATH)}.obj:
+    @echo $<
+    icc @<<
+    $(CPPFLAGS) /Fo$@ /Tp $<
+    $(THISDIR)\$(@B).cpp
+<<
+
+all:    $(PROGTARGET)
 
 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
-#        cd $(THISDIR)
+        cd $(THISDIR)
 
-$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
+$(PROGRAM).obj:: $(OPATH)\$(PROGRAM).obj
+$(OPATH)\$(PROGRAM).obj: $(THISDIR)\$(PROGRAM).cpp
+
+$(PROGRAM).res:: $(PROGRES)
+$(PROGRES):
+    $(RC) -I $(WXDIR)\include -D __VISAGECPP__ -r $(PROGRC) $(PROGRES)
+
+$(PROGRAM).exe:: $(PROGTARGET)
+$(PROGTARGET):   $(OBJECTS) $(PROGRES) $(DUMMYOBJ) $(WXLIB)
     @echo " Link::Linker "
     $(LINK) @<<
         /B" $(LINKFLAGS)" /Fe$@
@@ -30,15 +48,12 @@ $(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
         $(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)
-        -erase *.exe
-        -erase *.obj
-        -erase *.res
-        -erase *.map
+        -erase $(OPATH)\*.exe
+        -erase $(OPATH)\*.obj
+        -erase $(OPATH)\*.res
+        -erase $(OPATH)\*.map
 

diff --git a/src/makeva.env b/src/makeva.env
index e0652412dcdb5dde992c9b9d3afd6f2f07916eb7..e20f5004c9ba1e6a914ba2fdeb7ff6a0329d69bf 100644 (file)
--- a/src/makeva.env
+++ b/src/makeva.env
@@ -19,8 +19,8 @@ OS2LIBFLAGS=/NOL /NOE
 WXDIR=$(WXWIN)
 
 # Set to where your UPM and LAN libs are
-UPMLIB=C:\OS2TK45
-NETLIB=C:\OS2TK45
+UPMLIB=C:\OS2TK45\LIB
+NETLIB=C:\OS2TK45\LIB
 TCPIP=C:\OS2TK45\LIB
 
 WXSRC=$(WXDIR)\src\os2