From 22dcb6df90ca81368ee066d3fdcf5c4174a4c4e2 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Fri, 12 Sep 2003 09:02:46 +0000 Subject: [PATCH] Blind fix for library ordering. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/convertrc/Makefile.in | 2 +- contrib/utils/convertrc/convertrc.bkl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/utils/convertrc/Makefile.in b/contrib/utils/convertrc/Makefile.in index b195b9c628..72495c4a09 100644 --- a/contrib/utils/convertrc/Makefile.in +++ b/contrib/utils/convertrc/Makefile.in @@ -112,7 +112,7 @@ clean: rm -f convertrc$(EXEEXT) convertrc$(EXEEXT): $(CONVERTRC_OBJECTS) $(__convertrc___win32rc) - $(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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) + $(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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) $(__convertrc___mac_rezcmd) $(__convertrc___mac_setfilecmd) diff --git a/contrib/utils/convertrc/convertrc.bkl b/contrib/utils/convertrc/convertrc.bkl index a2b1bfd50a..4b1b40fad6 100644 --- a/contrib/utils/convertrc/convertrc.bkl +++ b/contrib/utils/convertrc/convertrc.bkl @@ -11,8 +11,8 @@ rc2xml.cpp wxr2xml.cpp - core deprecated + core xml base wxconvert.rc -- 2.45.2