New makefiles for samples under Visual C++

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

utils/framelayout/samples/Makefile.vc

@@ -0,0 +1,35 @@
+#
+# File:		makefile.vc
+# Author:	J. Russell Smyth
+# Created:	1999
+# Updated:	
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds framelayout samples for Win95, MSVC++ 4.0
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+THISDIR=$(WXDIR)\utils\framelayout\samples
+
+!include $(WXDIR)\src\makevc.env
+
+all:
+        cd $(WXDIR)\utils\framelayout\samples\test
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\utils\framelayout\samples\demo
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\utils\framelayout\samples\sample
+        nmake -f makefile.vc FINAL=$(FINAL)
+
+clean:
+        cd $(WXDIR)\utils\framelayout\samples\test
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\utils\framelayout\samples\demo
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\utils\framelayout\samples\sample
+        nmake -f makefile.vc clean

utils/framelayout/samples/demo/Makefile.vc

@@ -0,0 +1,21 @@
+#
+# File:		makefile.vc
+# Author:	J Russell Smyth
+# Created:	1999
+# Updated:	
+# Copyright:	
+#
+# Makefile : Builds frame layout demo
+# Use FINAL=1 argument to nmake to build final version with no debug info.
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+EXTRAINC = -I..\..\src
+EXTRALIBS = $(WXDIR)\lib\fl.lib
+EXTRAFLAGS = /DwxDUMMY_OBJ_INCLUDED
+PROGRAM=fl_demo
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.vc
+

utils/framelayout/samples/demo/fl_demo.cpp

@@ -51,7 +51,9 @@
 #include "wxinfo.h"
 
 // ADDED by alex (linker complaints...):
+#ifndef wxDUMMY_OBJ_INCLUDED
 char wxDummyChar=0;
+#endif
 
 /***** Implementation for class MyApp *****/
 

utils/framelayout/samples/demo/fl_demo.rc

@@ -0,0 +1,2 @@
+#include "wx/msw/wx.rc"
+

utils/framelayout/samples/sample/Makefile.vc

@@ -0,0 +1,21 @@
+#
+# File:		makefile.vc
+# Author:	J Russell Smyth
+# Created:	1999
+# Updated:	
+# Copyright:	
+#
+# Makefile : Builds frame layout sample
+# Use FINAL=1 argument to nmake to build final version with no debug info.
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+EXTRAINC = -I..\..\src
+EXTRALIBS = $(WXDIR)\lib\fl.lib
+EXTRAFLAGS = /DwxDUMMY_OBJ_INCLUDED
+PROGRAM=fl_sample
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.vc
+

utils/framelayout/samples/sample/fl_sample.cpp

@@ -35,7 +35,9 @@
 #include "wx/textctrl.h"
 
 // ADDED by alex (linker complaints...):
+#ifndef wxDUMMY_OBJ_INCLUDED
 char wxDummyChar=0;
+#endif
 
 #define ID_LOAD  102
 #define ID_STORE 103

utils/framelayout/samples/sample/fl_sample.rc

@@ -0,0 +1,2 @@
+#include "wx/msw/wx.rc"
+

utils/framelayout/samples/test/Makefile.vc

@@ -0,0 +1,21 @@
+#
+# File:		makefile.vc
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:	(c) Julian Smart
+#
+# Makefile : Builds sample (VC++, WIN32)
+# Use FINAL=1 argument to nmake to build final version with no debug info.
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+EXTRAINC = -I..\..\src
+EXTRALIBS = $(WXDIR)\lib\fl.lib
+EXTRAFLAGS = /DwxDUMMY_OBJ_INCLUDED
+PROGRAM=fl_test
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.vc
+

utils/framelayout/samples/test/fl_test.cpp

@@ -48,7 +48,9 @@
 
 // comment it out if it breaks, (this is my workaround for MSDev 4.0 linker)
 
+#ifndef wxDUMMY_OBJ_INCLUDED
 char  wxDummyChar;
+#endif
 
 
 IMPLEMENT_APP	(MyApp)

utils/framelayout/samples/test/fl_test.rc

@@ -0,0 +1,2 @@
+#include "wx/msw/wx.rc"
+