wxUniv compilation fix for gs_windowHandles assignment

[wxWidgets.git] / utils / wxrc / Makefile.in

diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
index 063373addf6eaedd69feaef0112e58a7c0ef7bbc..734eed5ee0cbb96c324cf7c9ac9d08742c21be8f 100644 (file)
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -9,6 +9,7 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 LN_S = @LN_S@
@@ -32,6 +33,7 @@ TOOLKIT_VERSION = @TOOLKIT_VERSION@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_XML = @EXTRALIBS_XML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 wx_top_builddir = @wx_top_builddir@
 
@@ -42,7 +44,8 @@ WX_RELEASE = 2.9
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)
 WXRC_OBJECTS =  \
        wxrc_wxrc.o
 
@@ -60,6 +63,7 @@ WXRC_OBJECTS =  \
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
 @COND_USE_XRC_1@__wxrc___depname = wxrc$(EXEEXT)
+@COND_PLATFORM_MAC_0@__wxrc___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL wxrc$(EXEEXT)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -80,8 +84,6 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
        -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
@@ -108,7 +110,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
-@COND_USE_XRC_1@       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_XRC_1@       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
 @COND_USE_XRC_1@       
 @COND_USE_XRC_1@       $(__wxrc___mac_setfilecmd)