From 299d04bca86849d3342cae20ab5fb96585542df8 Mon Sep 17 00:00:00 2001 From: "J. Russell Smyth" Date: Fri, 12 Mar 1999 00:29:34 +0000 Subject: [PATCH] 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 | 35 +++++++++++++++++++ utils/framelayout/samples/demo/Makefile.vc | 21 +++++++++++ utils/framelayout/samples/demo/fl_demo.cpp | 2 ++ utils/framelayout/samples/demo/fl_demo.rc | 2 ++ utils/framelayout/samples/sample/Makefile.vc | 21 +++++++++++ .../framelayout/samples/sample/fl_sample.cpp | 2 ++ utils/framelayout/samples/sample/fl_sample.rc | 2 ++ utils/framelayout/samples/test/Makefile.vc | 21 +++++++++++ utils/framelayout/samples/test/fl_test.cpp | 2 ++ utils/framelayout/samples/test/fl_test.rc | 2 ++ 10 files changed, 110 insertions(+) create mode 100644 utils/framelayout/samples/Makefile.vc create mode 100644 utils/framelayout/samples/demo/Makefile.vc create mode 100644 utils/framelayout/samples/demo/fl_demo.rc create mode 100644 utils/framelayout/samples/sample/Makefile.vc create mode 100644 utils/framelayout/samples/sample/fl_sample.rc create mode 100644 utils/framelayout/samples/test/Makefile.vc create mode 100644 utils/framelayout/samples/test/fl_test.rc diff --git a/utils/framelayout/samples/Makefile.vc b/utils/framelayout/samples/Makefile.vc new file mode 100644 index 0000000000..a19d821432 --- /dev/null +++ b/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 diff --git a/utils/framelayout/samples/demo/Makefile.vc b/utils/framelayout/samples/demo/Makefile.vc new file mode 100644 index 0000000000..8af9e3b056 --- /dev/null +++ b/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 + diff --git a/utils/framelayout/samples/demo/fl_demo.cpp b/utils/framelayout/samples/demo/fl_demo.cpp index eb083f57c1..ea69a4d463 100644 --- a/utils/framelayout/samples/demo/fl_demo.cpp +++ b/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 *****/ diff --git a/utils/framelayout/samples/demo/fl_demo.rc b/utils/framelayout/samples/demo/fl_demo.rc new file mode 100644 index 0000000000..82bdf07561 --- /dev/null +++ b/utils/framelayout/samples/demo/fl_demo.rc @@ -0,0 +1,2 @@ +#include "wx/msw/wx.rc" + diff --git a/utils/framelayout/samples/sample/Makefile.vc b/utils/framelayout/samples/sample/Makefile.vc new file mode 100644 index 0000000000..2b78779ede --- /dev/null +++ b/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 + diff --git a/utils/framelayout/samples/sample/fl_sample.cpp b/utils/framelayout/samples/sample/fl_sample.cpp index 06458f05e7..0c5abcad4c 100644 --- a/utils/framelayout/samples/sample/fl_sample.cpp +++ b/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 diff --git a/utils/framelayout/samples/sample/fl_sample.rc b/utils/framelayout/samples/sample/fl_sample.rc new file mode 100644 index 0000000000..82bdf07561 --- /dev/null +++ b/utils/framelayout/samples/sample/fl_sample.rc @@ -0,0 +1,2 @@ +#include "wx/msw/wx.rc" + diff --git a/utils/framelayout/samples/test/Makefile.vc b/utils/framelayout/samples/test/Makefile.vc new file mode 100644 index 0000000000..68a6f8810a --- /dev/null +++ b/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 + diff --git a/utils/framelayout/samples/test/fl_test.cpp b/utils/framelayout/samples/test/fl_test.cpp index d1fb4e22a7..83425e2713 100644 --- a/utils/framelayout/samples/test/fl_test.cpp +++ b/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) diff --git a/utils/framelayout/samples/test/fl_test.rc b/utils/framelayout/samples/test/fl_test.rc new file mode 100644 index 0000000000..82bdf07561 --- /dev/null +++ b/utils/framelayout/samples/test/fl_test.rc @@ -0,0 +1,2 @@ +#include "wx/msw/wx.rc" + -- 2.45.2