Uses wxSystemSettings for colour when there is no window

[wxWidgets.git] / samples / console / Makefile.in

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index a9d98b6b3486d47a3e3b7e8a156255566300b49f..588bb69fa4e4a67546ca83a477225ce734865322 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -29,11 +29,11 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-CONSOLE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) \
-       $(CXXFLAGS)
+CONSOLE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
 CONSOLE_OBJECTS =  \
        console_console.o
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
 
 ### Conditionally set variables: ###
@@ -65,7 +65,6 @@ LIBDIRNAME = $(top_builddir)lib
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__MULTILIB_FLAG_p = -DwxUSE_GUI=0
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
@@ -85,7 +84,7 @@ clean:
        rm -f console$(EXEEXT)
 
 console$(EXEEXT): $(CONSOLE_OBJECTS)
-       $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS)
+       $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS)
        
        $(__console___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK)