Corrected points to pixels calculation

[wxWidgets.git] / samples / minimal / makefile.va

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
 # 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
 
 
 !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
 
 !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
 
 !include $(WXDIR)\src\makeprog.va