From 02a9235c005edb527e39549cf54776155e935565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sat, 9 Aug 2003 22:40:49 +0000
Subject: [PATCH] pass options to submakefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 demos/makefile.bcc | 10 ++++++++--
 demos/makefile.gcc |  9 +++++++--
 demos/makefile.wat |  9 +++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/demos/makefile.bcc b/demos/makefile.bcc
index aa8e8912ac..0213f62292 100644
--- a/demos/makefile.bcc
+++ b/demos/makefile.bcc
@@ -20,12 +20,18 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
+MAKEARGS = -DCPPFLAGS=$(CPPFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) \
+	-DLDFLAGS=$(LDFLAGS) -DCC=$(CC) -DUSE_GUI=$(USE_GUI) \
+	-DMONOLITHIC=$(MONOLITHIC) -DCXXFLAGS=$(CXXFLAGS) -DUSE_HTML=$(USE_HTML) \
+	-DBUILD=$(BUILD) -DDEBUG_INFO=$(DEBUG_INFO) -DVENDOR=$(VENDOR) \
+	-DUNICODE=$(UNICODE) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DMSLU=$(MSLU) \
+	-DWXUNIV=$(WXUNIV) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DCXX=$(CXX) -DCFG=$(CFG) \
+	-DCFLAGS=$(CFLAGS) -DSHARED=$(SHARED) -DUSE_ODBC=$(USE_ODBC) \
+	-DUSE_OPENGL=$(USE_OPENGL)
 
 ### Conditionally set variables: ###
 
 
-MAKEARGS = 
-
 
 ### Targets: ###
 
diff --git a/demos/makefile.gcc b/demos/makefile.gcc
index 24d532f4bf..ce83bfa386 100644
--- a/demos/makefile.gcc
+++ b/demos/makefile.gcc
@@ -12,12 +12,17 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
+MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
+	CC=$(CC) USE_GUI=$(USE_GUI) MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) \
+	GCC_VERSION=$(GCC_VERSION) USE_HTML=$(USE_HTML) BUILD=$(BUILD) \
+	DEBUG_INFO=$(DEBUG_INFO) VENDOR=$(VENDOR) UNICODE=$(UNICODE) \
+	OFFICIAL_BUILD=$(OFFICIAL_BUILD) MSLU=$(MSLU) WXUNIV=$(WXUNIV) \
+	RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) CFLAGS=$(CFLAGS) \
+	SHARED=$(SHARED) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL)
 
 ### Conditionally set variables: ###
 
 
-MAKEARGS = GCC_VERSION=$(GCC_VERSION)
-
 
 ### Targets: ###
 
diff --git a/demos/makefile.wat b/demos/makefile.wat
index 5bdf79ec69..a428ce7e4e 100644
--- a/demos/makefile.wat
+++ b/demos/makefile.wat
@@ -30,8 +30,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Variables: ###
 
-
-MAKEARGS = 
+MAKEARGS = CPPFLAGS=$(CPPFLAGS) OFFICIAL_BUILD=$(OFFICIAL_BUILD) &
+	WXUNIV=$(WXUNIV) DEBUG_FLAG=$(DEBUG_FLAG) CFLAGS=$(CFLAGS) &
+	RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) USE_GUI=$(USE_GUI) &
+	MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) CC=$(CC) USE_HTML=$(USE_HTML) &
+	BUILD=$(BUILD) LDFLAGS=$(LDFLAGS) DEBUG_INFO=$(DEBUG_INFO) SHARED=$(SHARED) &
+	VENDOR=$(VENDOR) USE_OPENGL=$(USE_OPENGL) USE_ODBC=$(USE_ODBC) &
+	UNICODE=$(UNICODE)
 
 
 ### Targets: ###