compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,6 +16,7 @@ CXXFLAGS = @CXXFLAGS@
|
|||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
EXTRALIBS = @EXTRALIBS@
|
EXTRALIBS = @EXTRALIBS@
|
||||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||||
|
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||||
HOST_SUFFIX = @HOST_SUFFIX@
|
HOST_SUFFIX = @HOST_SUFFIX@
|
||||||
INSTALL_DIR = @INSTALL_DIR@
|
INSTALL_DIR = @INSTALL_DIR@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
@@ -102,7 +103,7 @@ install_wxrc:
|
|||||||
uninstall:
|
uninstall:
|
||||||
|
|
||||||
wxrc$(EXEEXT): $(WXRC_OBJECTS)
|
wxrc$(EXEEXT): $(WXRC_OBJECTS)
|
||||||
$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__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) $(EXTRALIBS_GUI)
|
$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(EXTRALIBS_XML) $(__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) $(EXTRALIBS_GUI)
|
||||||
|
|
||||||
$(__wxrc___mac_setfilecmd)
|
$(__wxrc___mac_setfilecmd)
|
||||||
|
|
||||||
|
@@ -16,6 +16,7 @@ CXXFLAGS = @CXXFLAGS@
|
|||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
EXTRALIBS = @EXTRALIBS@
|
EXTRALIBS = @EXTRALIBS@
|
||||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||||
|
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||||
HOST_SUFFIX = @HOST_SUFFIX@
|
HOST_SUFFIX = @HOST_SUFFIX@
|
||||||
INSTALL_DIR = @INSTALL_DIR@
|
INSTALL_DIR = @INSTALL_DIR@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
@@ -102,7 +103,7 @@ install_wxrc:
|
|||||||
uninstall:
|
uninstall:
|
||||||
|
|
||||||
wxrc$(EXEEXT): $(WXRC_OBJECTS)
|
wxrc$(EXEEXT): $(WXRC_OBJECTS)
|
||||||
$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__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) $(EXTRALIBS_GUI)
|
$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(EXTRALIBS_XML) $(__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) $(EXTRALIBS_GUI)
|
||||||
|
|
||||||
$(__wxrc___mac_setfilecmd)
|
$(__wxrc___mac_setfilecmd)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user