pass options to submakefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
289919bf04
commit
02a9235c00
@ -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: ###
|
||||
|
||||
|
@ -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: ###
|
||||
|
||||
|
@ -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: ###
|
||||
|
Loading…
Reference in New Issue
Block a user