From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 2 Oct 2004 12:34:29 +0000 (+0000)
Subject: don't link GUI libs into wxrc
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d2ec8d8488803ae1421f2f285fc4ddd5389d38b4?ds=inline

don't link GUI libs into wxrc


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
index 79fdd9ff32..b947506729 100644
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -30,7 +30,6 @@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_XML = @EXTRALIBS_XML@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 
 ### Variables: ###
@@ -108,7 +107,7 @@ distclean: clean
 	rm -f configure 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)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
+@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
 @COND_USE_XRC_1@	
 @COND_USE_XRC_1@	$(__wxrc___mac_setfilecmd)
 
diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc
index 7e713fe4e8..1c8f4f7052 100644
--- a/utils/wxrc/makefile.bcc
+++ b/utils/wxrc/makefile.bcc
@@ -56,6 +56,9 @@ WXUNIVNAME = univ
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif
+!if "$(USE_XRC)" == "1"
+__wxrc___depname = $(OBJS)\wxrc.exe
+!endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG_2 = -Od
 !endif
@@ -139,7 +142,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\wxrc.exe
+all: $(__wxrc___depname)
 
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -151,10 +154,12 @@ clean:
 	-if exist $(OBJS)\wxrc.ilf del $(OBJS)\wxrc.ilf
 	-if exist $(OBJS)\wxrc.ils del $(OBJS)\wxrc.ils
 
+!if "$(USE_XRC)" == "1"
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
-	c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+	c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
 |
+!endif
 
 $(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp
 	$(CXX) -q -c -P -o$@ $(WXRC_CXXFLAGS) $**
diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc
index 895689bb41..dd8e6c5c99 100644
--- a/utils/wxrc/makefile.gcc
+++ b/utils/wxrc/makefile.gcc
@@ -52,6 +52,9 @@ endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif
+ifeq ($(USE_XRC),1)
+__wxrc___depname = $(OBJS)\wxrc.exe
+endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG_2 = -O0
 endif
@@ -141,14 +144,16 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\wxrc.exe
+all: $(__wxrc___depname)
 
 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
 	-if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
 
+ifeq ($(USE_XRC),1)
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
 	$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME)   $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) -lwxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+endif
 
 $(OBJS)\wxrc_wxrc.o: ./wxrc.cpp
 	$(CXX) -c -o $@ $(WXRC_CXXFLAGS) $<
diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc
index 0f6e2ffd74..609ff8a61c 100644
--- a/utils/wxrc/makefile.vc
+++ b/utils/wxrc/makefile.vc
@@ -49,6 +49,9 @@ WXUNIVNAME = univ
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif
+!if "$(USE_XRC)" == "1"
+__wxrc___depname = $(OBJS)\wxrc.exe
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_0 = /Zi
 !endif
@@ -198,7 +201,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\wxrc.exe
+all: $(__wxrc___depname)
 
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -207,10 +210,12 @@ clean:
 	-if exist $(OBJS)\wxrc.ilk del $(OBJS)\wxrc.ilk
 	-if exist $(OBJS)\wxrc.pdb del $(OBJS)\wxrc.pdb
 
+!if "$(USE_XRC)" == "1"
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
 	$(WXRC_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
 <<
+!endif
 
 $(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(WXRC_CXXFLAGS) $**
diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat
index a9f9890118..d4d61cc3f9 100644
--- a/utils/wxrc/makefile.wat
+++ b/utils/wxrc/makefile.wat
@@ -55,6 +55,10 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
+__wxrc___depname =
+!ifeq USE_XRC 1
+__wxrc___depname = $(OBJS)\wxrc.exe
+!endif
 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
@@ -187,7 +191,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\wxrc.exe
+all : .SYMBOLIC $(__wxrc___depname)
 
 clean : .SYMBOLIC 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -196,6 +200,7 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
 	-if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
 
+!ifeq USE_XRC 1
 $(OBJS)\wxrc.exe :  $(WXRC_OBJECTS)
 	@%create $(OBJS)\wxrc.lbc
 	@%append $(OBJS)\wxrc.lbc option quiet
@@ -203,9 +208,10 @@ $(OBJS)\wxrc.exe :  $(WXRC_OBJECTS)
 	@%append $(OBJS)\wxrc.lbc option caseexact
 	@%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
 	@for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i
-	@for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\wxrc.lbc library %i
+	@for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\wxrc.lbc library %i
 	@%append $(OBJS)\wxrc.lbc
 	wlink @$(OBJS)\wxrc.lbc
+!endif
 
 $(OBJS)\wxrc_wxrc.obj :  .AUTODEPEND .\wxrc.cpp
 	$(CXX) -zq -fo=$^@ $(WXRC_CXXFLAGS) $<
diff --git a/utils/wxrc/wxrc.bkl b/utils/wxrc/wxrc.bkl
index 0db09668c6..2ab71f69c9 100644
--- a/utils/wxrc/wxrc.bkl
+++ b/utils/wxrc/wxrc.bkl
@@ -4,7 +4,7 @@
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <exe id="wxrc" cond="USE_XRC=='1'"
-         template="wx_util_console" template_append="wx_append">
+         template="wx_util_console" template_append="wx_append_base">
         <sources>wxrc.cpp</sources>
         <wx-lib>xml</wx-lib>
         <wx-lib>base</wx-lib>