From ea5dbc97a36a5dd47d983fc7d7b0a43d00da80db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 30 Sep 2004 22:17:55 +0000 Subject: [PATCH] wxrc is in core utils now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/Makefile.in | 2 +- contrib/utils/wxrc/Makefile.in | 123 ----- contrib/utils/wxrc/makefile.bcc | 160 ------ contrib/utils/wxrc/makefile.gcc | 156 ------ contrib/utils/wxrc/makefile.vc | 216 -------- contrib/utils/wxrc/makefile.wat | 211 -------- contrib/utils/wxrc/mondrian.ico | Bin 766 -> 0 bytes contrib/utils/wxrc/wxrc.bkl | 14 - contrib/utils/wxrc/wxrc.cpp | 839 -------------------------------- contrib/utils/wxrc/wxrc.dsp | 443 ----------------- contrib/utils/wxrc/wxrc.dsw | 46 -- contrib/utils/wxrc/wxrc.rc | 2 - 12 files changed, 1 insertion(+), 2211 deletions(-) delete mode 100644 contrib/utils/wxrc/Makefile.in delete mode 100644 contrib/utils/wxrc/makefile.bcc delete mode 100644 contrib/utils/wxrc/makefile.gcc delete mode 100644 contrib/utils/wxrc/makefile.vc delete mode 100644 contrib/utils/wxrc/makefile.wat delete mode 100644 contrib/utils/wxrc/mondrian.ico delete mode 100644 contrib/utils/wxrc/wxrc.bkl delete mode 100644 contrib/utils/wxrc/wxrc.cpp delete mode 100644 contrib/utils/wxrc/wxrc.dsp delete mode 100644 contrib/utils/wxrc/wxrc.dsw delete mode 100644 contrib/utils/wxrc/wxrc.rc diff --git a/contrib/utils/Makefile.in b/contrib/utils/Makefile.in index ac939a3f58..c9e8b674b5 100644 --- a/contrib/utils/Makefile.in +++ b/contrib/utils/Makefile.in @@ -1,6 +1,6 @@ # $Id$ -CONTRIB_UTILS=wxrc wxrcedit convertrc +CONTRIB_UTILS=wxrcedit convertrc all: @for d in $(CONTRIB_UTILS); do (cd $$d && $(MAKE)); done diff --git a/contrib/utils/wxrc/Makefile.in b/contrib/utils/wxrc/Makefile.in deleted file mode 100644 index 748d62d6b9..0000000000 --- a/contrib/utils/wxrc/Makefile.in +++ /dev/null @@ -1,123 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - -@MAKE_SET@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -INSTALL = @INSTALL@ -EXEEXT = @EXEEXT@ -SETFILE = @SETFILE@ -STRIP = @STRIP@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DIR = @INSTALL_DIR@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ -bindir = @bindir@ -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ -TOOLKIT = @TOOLKIT@ -TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ -TOOLKIT_VERSION = @TOOLKIT_VERSION@ -EXTRALIBS = @EXTRALIBS@ -EXTRALIBS_XML = @EXTRALIBS_XML@ -EXTRALIBS_GUI = @EXTRALIBS_GUI@ -HOST_SUFFIX = @HOST_SUFFIX@ - -### Variables: ### - -DESTDIR = -WX_RELEASE = 2.5 -LIBDIRNAME = $(top_builddir)lib -WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ - $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) -WXRC_OBJECTS = \ - wxrc_wxrc.o - -### Conditionally set variables: ### - -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) -@COND_USE_GUI_0@PORTNAME = base -@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d -@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d -@COND_UNICODE_1@WXUNICODEFLAG = u -@COND_WXUNIV_1@WXUNIVNAME = univ -@COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxrc$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -COND_MONOLITHIC_0___WXLIB_XML_p = \ - -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p) -COND_MONOLITHIC_0___WXLIB_BASE_p = \ - -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@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) -@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ -@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) - -### Targets: ### - -all: wxrc$(EXEEXT) - -install: all install_wxrc - -uninstall: - -install-strip: install - $(STRIP) $(DESTDIR)$(bindir)/wxrc$(EXEEXT) - -clean: - rm -rf ./.deps ./.pch - rm -f ./*.o - rm -f wxrc$(EXEEXT) - -distclean: clean - rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile - -wxrc$(EXEEXT): $(WXRC_OBJECTS) - $(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) - - $(__wxrc___mac_setfilecmd) - -install_wxrc: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - -wxrc_wxrc.o: $(srcdir)/wxrc.cpp - $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $< - - -# Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d - -.PHONY: all install uninstall clean distclean install_wxrc diff --git a/contrib/utils/wxrc/makefile.bcc b/contrib/utils/wxrc/makefile.bcc deleted file mode 100644 index 040d9b4f5e..0000000000 --- a/contrib/utils/wxrc/makefile.bcc +++ /dev/null @@ -1,160 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 25 -OBJS = \ - bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) -WXRC_OBJECTS = \ - $(OBJS)\wxrc_wxrc.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_FLAG)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -O2 -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_6 = -tWR -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_6 = -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = i -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p = -D__WXDEBUG__ -!endif -!if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p = -D__WXDEBUG__ -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(SHARED)" == "0" -LIBDIRNAME = .\..\..\..\lib\bcc_lib$(CFG) -!endif -!if "$(SHARED)" == "1" -LIBDIRNAME = .\..\..\..\lib\bcc_dll$(CFG) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = -v -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\wxrc.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe - -if exist $(OBJS)\wxrc.tds del $(OBJS)\wxrc.tds - -if exist $(OBJS)\wxrc.ilc del $(OBJS)\wxrc.ilc - -if exist $(OBJS)\wxrc.ild del $(OBJS)\wxrc.ild - -if exist $(OBJS)\wxrc.ilf del $(OBJS)\wxrc.ilf - -if exist $(OBJS)\wxrc.ils del $(OBJS)\wxrc.ils - -$(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,, -| - -$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp - $(CXX) -q -c -P -o$@ $(WXRC_CXXFLAGS) $** diff --git a/contrib/utils/wxrc/makefile.gcc b/contrib/utils/wxrc/makefile.gcc deleted file mode 100644 index 57c5791693..0000000000 --- a/contrib/utils/wxrc/makefile.gcc +++ /dev/null @@ -1,156 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 25 -OBJS = \ - gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) -WXRC_OBJECTS = \ - $(OBJS)\wxrc_wxrc.o - -### Conditionally set variables: ### - -ifeq ($(GCC_VERSION),2.95) -GCCFLAGS = -fvtable-thunks -endif -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_FLAG),default) -WXDEBUGFLAG = d -endif -endif -ifeq ($(DEBUG_FLAG),1) -WXDEBUGFLAG = d -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_4 = -fno-rtti -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_4 = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_5 = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_5 = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_FLAG),default) -__DEBUG_DEFINE_p = -D__WXDEBUG__ -endif -endif -ifeq ($(DEBUG_FLAG),1) -__DEBUG_DEFINE_p = -D__WXDEBUG__ -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_XML_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) -endif -ifeq ($(MSLU),1) -__UNICOWS_LIB_p = -lunicows -endif -ifeq ($(SHARED),0) -LIBDIRNAME = .\..\..\..\lib\gcc_lib$(CFG) -endif -ifeq ($(SHARED),1) -LIBDIRNAME = .\..\..\..\lib\gcc_dll$(CFG) -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\wxrc.exe - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe - -$(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 - -$(OBJS)\wxrc_wxrc.o: ./wxrc.cpp - $(CXX) -c -o $@ $(WXRC_CXXFLAGS) $< - -.PHONY: all clean diff --git a/contrib/utils/wxrc/makefile.vc b/contrib/utils/wxrc/makefile.vc deleted file mode 100644 index aa92a4ab3d..0000000000 --- a/contrib/utils/wxrc/makefile.vc +++ /dev/null @@ -1,216 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 25 -OBJS = \ - vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ - /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) -WXRC_OBJECTS = \ - $(OBJS)\wxrc_wxrc.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_FLAG)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p = -!endif -!if "$(DEBUG_INFO)" == "0" -____DEBUGINFO_2_p = -!endif -!if "$(DEBUG_INFO)" == "1" -____DEBUGINFO_2_p = /D_DEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_3 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = T -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_8 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_8 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_9 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_9 = /GX -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p = /D__WXDEBUG__ -!endif -!if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p = /D__WXDEBUG__ -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(SHARED)" == "0" -LIBDIRNAME = .\..\..\..\lib\vc_lib$(CFG) -!endif -!if "$(SHARED)" == "1" -LIBDIRNAME = .\..\..\..\lib\vc_dll$(CFG) -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\wxrc.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe - -if exist $(OBJS)\wxrc.ilk del $(OBJS)\wxrc.ilk - -if exist $(OBJS)\wxrc.pdb del $(OBJS)\wxrc.pdb - -$(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 -<< - -$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXRC_CXXFLAGS) $** diff --git a/contrib/utils/wxrc/makefile.wat b/contrib/utils/wxrc/makefile.wat deleted file mode 100644 index d2936b2784..0000000000 --- a/contrib/utils/wxrc/makefile.wat +++ /dev/null @@ -1,211 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! loaddll wlink wlink -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -WXDEBUGFLAG = d -!endif -!endif -!ifeq DEBUG_FLAG 1 -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__RUNTIME_LIBS_5 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_5 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_5 = -!endif -__EXCEPTIONSFLAG_7 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_7 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_7 = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib -!endif -LIBDIRNAME = -!ifeq SHARED 0 -LIBDIRNAME = .\..\..\..\lib\wat_lib$(CFG) -!endif -!ifeq SHARED 1 -LIBDIRNAME = .\..\..\..\lib\wat_dll$(CFG) -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 25 -OBJS = & - wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & - -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) -WXRC_OBJECTS = & - $(OBJS)\wxrc_wxrc.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\wxrc.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe - -$(OBJS)\wxrc.exe : $(WXRC_OBJECTS) - @%create $(OBJS)\wxrc.lbc - @%append $(OBJS)\wxrc.lbc option quiet - @%append $(OBJS)\wxrc.lbc name $^@ - @%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 - @%append $(OBJS)\wxrc.lbc - wlink @$(OBJS)\wxrc.lbc - -$(OBJS)\wxrc_wxrc.obj : .AUTODEPEND .\wxrc.cpp - $(CXX) -zq -fo=$^@ $(WXRC_CXXFLAGS) $< diff --git a/contrib/utils/wxrc/mondrian.ico b/contrib/utils/wxrc/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Z - - - - - - - wxrc.cpp - xml - base - $(BINDIR) - - - diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp deleted file mode 100644 index 92be406592..0000000000 --- a/contrib/utils/wxrc/wxrc.cpp +++ /dev/null @@ -1,839 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wxrc.cpp -// Purpose: XML resource compiler -// Author: Vaclav Slavik, Eduardo Marques -// Created: 2000/03/05 -// RCS-ID: $Id$ -// Copyright: (c) 2000 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -// for all others, include the necessary headers -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/log.h" -#endif - -#include "wx/cmdline.h" -#include "wx/xml/xml.h" -#include "wx/ffile.h" -#include "wx/filename.h" -#include "wx/wfstream.h" - - -class XRCWidgetData -{ -public: - XRCWidgetData(const wxString& vname,const wxString& vclass) - : m_class(vclass), m_name(vname) {} - const wxString& GetName() const { return m_name; } - const wxString& GetClass() const { return m_class; } -private: - wxString m_class; - wxString m_name; -}; -#include "wx/arrimpl.cpp" -WX_DECLARE_OBJARRAY(XRCWidgetData,ArrayOfXRCWidgetData); -WX_DEFINE_OBJARRAY(ArrayOfXRCWidgetData); - -class XRCWndClassData -{ -private: - wxString m_className; - wxString m_parentClassName; - ArrayOfXRCWidgetData m_wdata; - - void BrowseXmlNode(wxXmlNode* node) - { - wxString classValue; - wxString nameValue; - wxXmlNode* children; - while (node) - { - if (node->GetName() == _T("object") - && node->GetPropVal(_T("class"),&classValue) - && node->GetPropVal(_T("name"),&nameValue)) - { - m_wdata.Add(XRCWidgetData(nameValue,classValue)); - } - children = node->GetChildren(); - if (children) - BrowseXmlNode(children); - node = node->GetNext(); - } - } - -public: - XRCWndClassData(const wxString& className,const wxString& parentClassName, const wxXmlNode* node) : - m_className(className) , m_parentClassName(parentClassName) { - - BrowseXmlNode(node->GetChildren()); - - } - - const ArrayOfXRCWidgetData& GetWidgetData(){ - return m_wdata; - } - - bool IsRealClass(const wxString& name) - { - if (name == _T("tool") || name == _T("unknown") || - name == _T("notebookpage") || name == _T("separator") || - name == _T("sizeritem") || - name == _T("wxMenuItem")) - { - return false; - } - return true; - } - - void GenerateHeaderCode(wxFFile& file) - { - - file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName - + _T(" {\nprotected:\n")); - size_t i; - for(i=0;iLoadObject(this,NULL,\"") - + m_className - + _T("\",\"") - + m_parentClassName - + _T("\");\n")); - for(i=0;iGetChildren(); - wxString classValue,nameValue; - while(node){ - if(node->GetName() == _T("object") - && node->GetPropVal(_T("class"),&classValue) - && node->GetPropVal(_T("name"),&nameValue)){ - - aXRCWndClassData.Add( - XRCWndClassData(nameValue,classValue,node) - ); - } - node = node -> GetNext(); - } - } - wxString internalName = GetInternalFileName(parFiles[i], flist); - - doc.Save(parOutputPath + wxFILE_SEP_PATH + internalName); - flist.Add(internalName); - } - - return flist; -} - - -// Does 'node' contain filename information at all? -static bool NodeContainsFilename(wxXmlNode *node) -{ - // Any bitmaps: - if (node->GetName() == _T("bitmap")) - return true; - - // URLs in wxHtmlWindow: - if (node->GetName() == _T("url")) - return true; - - // wxBitmapButton: - wxXmlNode *parent = node->GetParent(); - if (parent != NULL && - parent->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") && - (node->GetName() == _T("focus") || - node->GetName() == _T("disabled") || - node->GetName() == _T("selected"))) - return true; - - // wxBitmap or wxIcon toplevel resources: - if (node->GetName() == _T("object")) - { - wxString klass = node->GetPropVal(_T("class"), wxEmptyString); - if (klass == _T("wxBitmap") || klass == _T("wxIcon")) - return true; - } - - return false; -} - -// find all files mentioned in structure, e.g. filename -void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath) -{ - // Is 'node' XML node element? - if (node == NULL) return; - if (node->GetType() != wxXML_ELEMENT_NODE) return; - - bool containsFilename = NodeContainsFilename(node); - - wxXmlNode *n = node->GetChildren(); - while (n) - { - if (containsFilename && - (n->GetType() == wxXML_TEXT_NODE || - n->GetType() == wxXML_CDATA_SECTION_NODE)) - { - wxString fullname; - if (wxIsAbsolutePath(n->GetContent()) || inputPath.empty()) - fullname = n->GetContent(); - else - fullname = inputPath + wxFILE_SEP_PATH + n->GetContent(); - - if (flagVerbose) - wxPrintf(_T("adding ") + fullname + _T("...\n")); - - wxString filename = GetInternalFileName(n->GetContent(), flist); - n->SetContent(filename); - - if (flist.Index(filename) == wxNOT_FOUND) - flist.Add(filename); - - wxFileInputStream sin(fullname); - wxFileOutputStream sout(parOutputPath + wxFILE_SEP_PATH + filename); - sin.Read(sout); // copy the stream - } - - // subnodes: - if (n->GetType() == wxXML_ELEMENT_NODE) - FindFilesInXML(n, flist, inputPath); - - n = n->GetNext(); - } -} - - - -void XmlResApp::DeleteTempFiles(const wxArrayString& flist) -{ - for (size_t i = 0; i < flist.Count(); i++) - wxRemoveFile(parOutputPath + wxFILE_SEP_PATH + flist[i]); -} - - - -void XmlResApp::MakePackageZIP(const wxArrayString& flist) -{ - wxString files; - - for (size_t i = 0; i < flist.Count(); i++) - files += flist[i] + _T(" "); - files.RemoveLast(); - - if (flagVerbose) - wxPrintf(_T("compressing ") + parOutput + _T("...\n")); - - wxString cwd = wxGetCwd(); - wxSetWorkingDirectory(parOutputPath); - int execres = wxExecute(_T("zip -9 -j ") + - wxString(flagVerbose ? _T("") : _T("-q ")) + - parOutput + _T(" ") + files, true); - wxSetWorkingDirectory(cwd); - if (execres == -1) - { - wxLogError(_T("Unable to execute zip program. Make sure it is in the path.")); - wxLogError(_T("You can download it at http://www.cdrom.com/pub/infozip/")); - retCode = 1; - return; - } -} - - - -static wxString FileToCppArray(wxString filename, int num) -{ - wxString output; - wxString tmp; - wxString snum; - wxFFile file(filename, wxT("rb")); - size_t lng = file.Length(); - - snum.Printf(_T("%i"), num); - output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng); - output += _T("static unsigned char xml_res_file_") + snum + _T("[] = {\n"); - // we cannot use string literals because MSVC is dumb wannabe compiler - // with arbitrary limitation to 2048 strings :( - - unsigned char *buffer = new unsigned char[lng]; - file.Read(buffer, lng); - - for (size_t i = 0, linelng = 0; i < lng; i++) - { - tmp.Printf(_T("%i"), buffer[i]); - if (i != 0) output << _T(','); - if (linelng > 70) - { - linelng = 0; - output << _T("\n"); - } - output << tmp; - linelng += tmp.Length()+1; - } - - delete[] buffer; - - output += _T("};\n\n"); - - return output; -} - - -void XmlResApp::MakePackageCPP(const wxArrayString& flist) -{ - wxFFile file(parOutput, wxT("wt")); - size_t i; - - if (flagVerbose) - wxPrintf(_T("creating C++ source file ") + parOutput + _T("...\n")); - - file.Write(_T("") -_T("//\n") -_T("// This file was automatically generated by wxrc, do not edit by hand.\n") -_T("//\n\n") -_T("#include \n") -_T("\n") -_T("#ifdef __BORLANDC__\n") -_T(" #pragma hdrstop\n") -_T("#endif\n") -_T("\n") -_T("#ifndef WX_PRECOMP\n") -_T(" #include \n") -_T("#endif\n") -_T("") -_T("#include \n") -_T("#include \n") -_T("#include \n") -_T("#include \n") -_T("\n")); - - for (i = 0; i < flist.Count(); i++) - file.Write( - FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i)); - - file.Write(_T("") -_T("void ") + parFuncname + wxT("()\n") -_T("{\n") -_T("\n") -_T(" // Check for memory FS. If not present, load the handler:\n") -_T(" {\n") -_T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n") -_T(" wxFileSystem fsys;\n") -_T(" wxFSFile *f = fsys.OpenFile(wxT(\"memory:XRC_resource/dummy_file\"));\n") -_T(" wxMemoryFSHandler::RemoveFile(wxT(\"XRC_resource/dummy_file\"));\n") -_T(" if (f) delete f;\n") -_T(" else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n") -_T(" }\n") -_T("\n")); - - for (i = 0; i < flist.Count(); i++) - { - wxString s; - s.Printf(_T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/") + flist[i] + - _T("\"), xml_res_file_%i, xml_res_size_%i);\n"), i, i); - file.Write(s); - } - - for (i = 0; i < parFiles.Count(); i++) - { - file.Write(_T(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") + - GetInternalFileName(parFiles[i], flist) + _T("\"));\n")); - } - - file.Write(_T("}\n")); - - -} - -void XmlResApp::GenCPPHeader() -{ - wxString fileSpec = ((parOutput.BeforeLast('.')).AfterLast('/')).AfterLast('\\'); - wxString heaFileName = fileSpec + _T(".h"); - - wxFFile file(heaFileName, wxT("wt")); - file.Write( -_T("//\n") -_T("// This file was automatically generated by wxrc, do not edit by hand.\n") -_T("//\n\n") -_T("#ifndef __") + fileSpec + _T("_h__\n") -_T("#define __") + fileSpec + _T("_h__\n") -); - for(size_t i=0;i 127) - tmp.Printf(_T("\\x%02x"), c); - else if (c == '\\') - tmp = _T("\\\\"); - else - tmp = (wxChar)c; - if (linelng > 70) - { - linelng = 0; - output << _T("\\\n"); - } - output << tmp; - linelng += tmp.Length(); - } - - delete[] buffer; - - output += _T("\"\"\"\n\n"); - - return output; -} - - -void XmlResApp::MakePackagePython(const wxArrayString& flist) -{ - wxFFile file(parOutput, wxT("wt")); - size_t i; - - if (flagVerbose) - wxPrintf(_T("creating Python source file ") + parOutput + _T("...\n")); - - file.Write( - _T("#\n") - _T("# This file was automatically generated by wxrc, do not edit by hand.\n") - _T("#\n\n") - _T("from wxPython.wx import *\n") - _T("from wxPython.xrc import *\n\n") - ); - - - file.Write(_T("def ") + parFuncname + _T("():\n")); - - for (i = 0; i < flist.Count(); i++) - file.Write( - FileToPythonArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i)); - - for (i = 0; i < flist.Count(); i++) - { - wxString s; - s.Printf(_T(" wxXmlResource_Get().LoadFromString(xml_res_file_%i)\n"), i); - file.Write(s); - } -} - - - -void XmlResApp::OutputGettext() -{ - wxArrayString str = FindStrings(); - - wxFFile fout; - if (parOutput.empty()) - fout.Attach(stdout); - else - fout.Open(parOutput, wxT("wt")); - - for (size_t i = 0; i < str.GetCount(); i++) - fout.Write(_T("_(\"") + str[i] + _T("\");\n")); - - if (!parOutput) fout.Detach(); -} - - - -wxArrayString XmlResApp::FindStrings() -{ - wxArrayString arr, a2; - - for (size_t i = 0; i < parFiles.Count(); i++) - { - if (flagVerbose) - wxPrintf(_T("processing ") + parFiles[i] + _T("...\n")); - - wxXmlDocument doc; - if (!doc.Load(parFiles[i])) - { - wxLogError(_T("Error parsing file ") + parFiles[i]); - retCode = 1; - continue; - } - a2 = FindStrings(doc.GetRoot()); - WX_APPEND_ARRAY(arr, a2); - } - - return arr; -} - - - -static wxString ConvertText(const wxString& str) -{ - wxString str2; - const wxChar *dt; - - for (dt = str.c_str(); *dt; dt++) - { - if (*dt == wxT('_')) - { - if ( *(++dt) == wxT('_') ) - str2 << wxT('_'); - else - str2 << wxT('&') << *dt; - } - else - { - switch (*dt) - { - case wxT('\n') : str2 << wxT("\\n"); break; - case wxT('\t') : str2 << wxT("\\t"); break; - case wxT('\r') : str2 << wxT("\\r"); break; - case wxT('\\') : if ((*(dt+1) != 'n') && - (*(dt+1) != 't') && - (*(dt+1) != 'r')) - str2 << wxT("\\\\"); - else - str2 << wxT("\\"); - break; - case wxT('"') : str2 << wxT("\\\""); break; - default : str2 << *dt; break; - } - } - } - - return str2; -} - - -wxArrayString XmlResApp::FindStrings(wxXmlNode *node) -{ - wxArrayString arr; - - wxXmlNode *n = node; - if (n == NULL) return arr; - n = n->GetChildren(); - - while (n) - { - if ((node->GetType() == wxXML_ELEMENT_NODE) && - // parent is an element, i.e. has subnodes... - (n->GetType() == wxXML_TEXT_NODE || - n->GetType() == wxXML_CDATA_SECTION_NODE) && - // ...it is textnode... - ( - node/*not n!*/->GetName() == _T("label") || - (node/*not n!*/->GetName() == _T("value") && - !n->GetContent().IsNumber()) || - node/*not n!*/->GetName() == _T("help") || - node/*not n!*/->GetName() == _T("longhelp") || - node/*not n!*/->GetName() == _T("tooltip") || - node/*not n!*/->GetName() == _T("htmlcode") || - node/*not n!*/->GetName() == _T("title") || - node/*not n!*/->GetName() == _T("item") - )) - // ...and known to contain translatable string - { - if (!flagGettext || - node->GetPropVal(_T("translate"), _T("1")) != _T("0")) - { - arr.Add(ConvertText(n->GetContent())); - } - } - - // subnodes: - if (n->GetType() == wxXML_ELEMENT_NODE) - { - wxArrayString a2 = FindStrings(n); - WX_APPEND_ARRAY(arr, a2); - } - - n = n->GetNext(); - } - return arr; -} diff --git a/contrib/utils/wxrc/wxrc.dsp b/contrib/utils/wxrc/wxrc.dsp deleted file mode 100644 index b4a84c9a06..0000000000 --- a/contrib/utils/wxrc/wxrc.dsp +++ /dev/null @@ -1,443 +0,0 @@ -# Microsoft Developer Studio Project File - Name="wxrc" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=wxrc - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "wxrc.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "wxrc.mak" CFG="wxrc - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "wxrc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 DLL Universal Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 DLL Universal Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 DLL Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 DLL Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 Universal Unicode Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 Universal Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 Universal Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 Unicode Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "wxrc - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "wxrc - Win32 DLL Universal Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "vc_mswunivudll" -# PROP BASE Intermediate_Dir "vc_mswunivudll\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswunivudll" -# PROP Intermediate_Dir "vc_mswunivudll\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswunivu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswunivu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d _CONSOLE -# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25u_xml.lib wxbase25u.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregexu25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\wxrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:console -# ADD LINK32 wxbase25u_xml.lib wxbase25u.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregexu25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\wxrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 DLL Universal Unicode Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivuddll" -# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivuddll" -# PROP Intermediate_Dir "vc_mswunivuddll\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswunivud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswunivud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d _CONSOLE -# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25ud_xml.lib wxbase25ud.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexud25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:console -# ADD LINK32 wxbase25ud_xml.lib wxbase25ud.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexud25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 DLL Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "vc_mswunivdll" -# PROP BASE Intermediate_Dir "vc_mswunivdll\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswunivdll" -# PROP Intermediate_Dir "vc_mswunivdll\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswuniv" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswuniv" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d _CONSOLE -# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25_xml.lib wxbase25.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregex25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\wxrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:console -# ADD LINK32 wxbase25_xml.lib wxbase25.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregex25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\wxrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 DLL Universal Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivddll" -# PROP BASE Intermediate_Dir "vc_mswunivddll\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivddll" -# PROP Intermediate_Dir "vc_mswunivddll\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswunivd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswunivd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d _CONSOLE -# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25d_xml.lib wxbase25d.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexd25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:console -# ADD LINK32 wxbase25d_xml.lib wxbase25d.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexd25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 DLL Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "vc_mswudll" -# PROP BASE Intermediate_Dir "vc_mswudll\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswudll" -# PROP Intermediate_Dir "vc_mswudll\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswudll\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d _CONSOLE -# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25u_xml.lib wxbase25u.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregexu25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\wxrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:console -# ADD LINK32 wxbase25u_xml.lib wxbase25u.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregexu25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\wxrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 DLL Unicode Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswuddll" -# PROP BASE Intermediate_Dir "vc_mswuddll\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswuddll" -# PROP Intermediate_Dir "vc_mswuddll\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d _CONSOLE -# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25ud_xml.lib wxbase25ud.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexud25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:console -# ADD LINK32 wxbase25ud_xml.lib wxbase25ud.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexud25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 DLL Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "vc_mswdll" -# PROP BASE Intermediate_Dir "vc_mswdll\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswdll" -# PROP Intermediate_Dir "vc_mswdll\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\msw" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswdll\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\msw" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d _CONSOLE -# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25_xml.lib wxbase25.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregex25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\wxrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:console -# ADD LINK32 wxbase25_xml.lib wxbase25.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregex25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\wxrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 DLL Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswddll" -# PROP BASE Intermediate_Dir "vc_mswddll\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswddll" -# PROP Intermediate_Dir "vc_mswddll\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_dll\mswd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d _CONSOLE -# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25d_xml.lib wxbase25d.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexd25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:console -# ADD LINK32 wxbase25d_xml.lib wxbase25d.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexd25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 Universal Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "vc_mswunivu" -# PROP BASE Intermediate_Dir "vc_mswunivu\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswunivu" -# PROP Intermediate_Dir "vc_mswunivu\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswunivu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswunivu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswunivu" /i "." /d _CONSOLE -# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswunivu" /i "." /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25u_xml.lib wxbase25u.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregexu25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\wxrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:console -# ADD LINK32 wxbase25u_xml.lib wxbase25u.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregexu25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\wxrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 Universal Unicode Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivud" -# PROP BASE Intermediate_Dir "vc_mswunivud\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivud" -# PROP Intermediate_Dir "vc_mswunivud\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswunivud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswunivud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswunivud" /i "." /d _CONSOLE -# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswunivud" /i "." /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25ud_xml.lib wxbase25ud.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexud25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:console -# ADD LINK32 wxbase25ud_xml.lib wxbase25ud.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexud25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "vc_mswuniv" -# PROP BASE Intermediate_Dir "vc_mswuniv\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswuniv" -# PROP Intermediate_Dir "vc_mswuniv\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswuniv" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswuniv" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswuniv" /i "." /d _CONSOLE -# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswuniv" /i "." /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25_xml.lib wxbase25.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregex25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\wxrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:console -# ADD LINK32 wxbase25_xml.lib wxbase25.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregex25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\wxrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 Universal Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivd" -# PROP BASE Intermediate_Dir "vc_mswunivd\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivd" -# PROP Intermediate_Dir "vc_mswunivd\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswunivd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswunivd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswunivd" /i "." /d _CONSOLE -# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswunivd" /i "." /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25d_xml.lib wxbase25d.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexd25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:console -# ADD LINK32 wxbase25d_xml.lib wxbase25d.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexd25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 Unicode Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "vc_mswu" -# PROP BASE Intermediate_Dir "vc_mswu\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswu" -# PROP Intermediate_Dir "vc_mswu\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswu\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswu" /i "." /d _CONSOLE -# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswu" /i "." /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25u_xml.lib wxbase25u.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregexu25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\wxrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:console -# ADD LINK32 wxbase25u_xml.lib wxbase25u.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregexu25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\wxrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 Unicode Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswud" -# PROP BASE Intermediate_Dir "vc_mswud\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswud" -# PROP Intermediate_Dir "vc_mswud\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswud" /i "." /d _CONSOLE -# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswud" /i "." /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25ud_xml.lib wxbase25ud.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexud25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:console -# ADD LINK32 wxbase25ud_xml.lib wxbase25ud.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexud25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "vc_msw" -# PROP BASE Intermediate_Dir "vc_msw\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_msw" -# PROP Intermediate_Dir "vc_msw\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\msw" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Fdvc_msw\wxrc.pdb /O1 /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\msw" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\msw" /i "." /d _CONSOLE -# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\msw" /i "." /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25_xml.lib wxbase25.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregex25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\wxrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:console -# ADD LINK32 wxbase25_xml.lib wxbase25.lib wxtiff25.lib wxjpeg25.lib wxpng25.lib wxzlib25.lib wxregex25.lib wxexpat25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\wxrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:console - -!ELSEIF "$(CFG)" == "wxrc - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswd" -# PROP BASE Intermediate_Dir "vc_mswd\wxrc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswd" -# PROP Intermediate_Dir "vc_mswd\wxrc" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\wxrc.pdb /Od /GR /GX /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_lib\mswd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /c -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswd" /i "." /d _CONSOLE -# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_lib\mswd" /i "." /d _CONSOLE -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxbase25d_xml.lib wxbase25d.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexd25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:console -# ADD LINK32 wxbase25d_xml.lib wxbase25d.lib wxtiffd25.lib wxjpegd25.lib wxpngd25.lib wxzlibd25.lib wxregexd25.lib wxexpatd25.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\wxrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:console - -!ENDIF - -# Begin Target - -# Name "wxrc - Win32 DLL Universal Unicode Release" -# Name "wxrc - Win32 DLL Universal Unicode Debug" -# Name "wxrc - Win32 DLL Universal Release" -# Name "wxrc - Win32 DLL Universal Debug" -# Name "wxrc - Win32 DLL Unicode Release" -# Name "wxrc - Win32 DLL Unicode Debug" -# Name "wxrc - Win32 DLL Release" -# Name "wxrc - Win32 DLL Debug" -# Name "wxrc - Win32 Universal Unicode Release" -# Name "wxrc - Win32 Universal Unicode Debug" -# Name "wxrc - Win32 Universal Release" -# Name "wxrc - Win32 Universal Debug" -# Name "wxrc - Win32 Unicode Release" -# Name "wxrc - Win32 Unicode Debug" -# Name "wxrc - Win32 Release" -# Name "wxrc - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\wxrc.cpp -# End Source File -# End Group -# End Target -# End Project - diff --git a/contrib/utils/wxrc/wxrc.dsw b/contrib/utils/wxrc/wxrc.dsw deleted file mode 100644 index f04ec9e414..0000000000 --- a/contrib/utils/wxrc/wxrc.dsw +++ /dev/null @@ -1,46 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### -Project: "wxrc"=wxrc.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -Begin Project Dependency -Project_Dep_Name xml -End Project Dependency -Begin Project Dependency -Project_Dep_Name base -End Project Dependency -}}} - -############################################################################### - -Project: "xml"=..\..\..\build\msw\wx_xml.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - diff --git a/contrib/utils/wxrc/wxrc.rc b/contrib/utils/wxrc/wxrc.rc deleted file mode 100644 index 74b8e3f417..0000000000 --- a/contrib/utils/wxrc/wxrc.rc +++ /dev/null @@ -1,2 +0,0 @@ -mondrian ICON "mondrian.ico" -#include "wx/msw/wx.rc"