don't link wxBase against GUI libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -15,6 +15,7 @@ CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
RESCOMP = @RESCOMP@
|
||||
@@ -85,7 +86,7 @@ ABOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top
|
||||
all: about$(EXEEXT) data
|
||||
|
||||
about$(EXEEXT): about_about.o $(__about___win32rc)
|
||||
$(CXX) -o $@ about_about.o $(__about___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
|
||||
$(CXX) -o $@ about_about.o $(__about___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
$(__about___mac_rezcmd)
|
||||
$(__about___mac_setfilecmd)
|
||||
|
||||
@@ -99,7 +100,6 @@ clean:
|
||||
rm -rf ./.deps
|
||||
rm -f -f ./*.o
|
||||
rm -f about$(EXEEXT)
|
||||
rm -f ./about.htm ./logo.png
|
||||
|
||||
data:
|
||||
@mkdir -p ./data
|
||||
|
Reference in New Issue
Block a user