Fix building non-GUI samples out of tree
Define wxUSE_GUI=0 for them.
This commit is contained in:
parent
44b99195bc
commit
121631514c
4 changed files with 10 additions and 8 deletions
|
|
@ -37,9 +37,11 @@
|
|||
</define-rule>
|
||||
|
||||
|
||||
<!-- empty stubs for things that don't make sense for makefile.unx: -->
|
||||
<!-- Define templates used by the samples -->
|
||||
<template id="wx_append"/>
|
||||
<template id="wx_append_base"/>
|
||||
<template id="wx_append_base">
|
||||
<cxxflags>-DwxUSE_GUI=0</cxxflags>
|
||||
</template>
|
||||
|
||||
<define-rule name="wx-data" pseudo="1">
|
||||
<define-tag name="files"/>
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
|
|||
WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
|
||||
WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
|
||||
--toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
|
||||
CONSOLE_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
CONSOLE_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
|
||||
-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
|
||||
CONSOLE_OBJECTS = \
|
||||
console_console.o
|
||||
|
||||
|
|
|
|||
|
|
@ -59,11 +59,11 @@ IPCSERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
|
|||
IPCSERVER_OBJECTS = \
|
||||
ipcserver_server.o
|
||||
BASEIPCCLIENT_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
|
||||
BASEIPCCLIENT_OBJECTS = \
|
||||
baseipcclient_baseclient.o
|
||||
BASEIPCSERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
|
||||
BASEIPCSERVER_OBJECTS = \
|
||||
baseipcserver_baseserver.o
|
||||
|
||||
|
|
|
|||
|
|
@ -59,11 +59,11 @@ SERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
|
|||
SERVER_OBJECTS = \
|
||||
server_server.o
|
||||
BASECLIENT_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
|
||||
BASECLIENT_OBJECTS = \
|
||||
baseclient_baseclient.o
|
||||
BASESERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
|
||||
BASESERVER_OBJECTS = \
|
||||
baseserver_baseserver.o
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue