diff --git a/BuildSVN.txt b/BuildSVN.txt index 06d5fd8b73..95d614921a 100644 --- a/BuildSVN.txt +++ b/BuildSVN.txt @@ -2,243 +2,12 @@ How to build the sources from SVN ------------------------------------------------------------------------ -Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac -etc. alongside these instructions. - -I) Windows using plain makefiles ----------------------------------------- - -a) If using Microsoft Visual C++ 5.0 or 6.0 - -Ensure that the command-line compiler and tools (including -nmake) are installed and ready to run. Depending on your -installation there may be a batch file (commonly named VCVARS32.BAT) -that needs to be run to set correct environment variables and PATH entries. - -Continue with item c) below. - - -b) If using the MinGW or Cygwin compilers - -You can get MinGW from http://www.mingw.org/ - -Cygwin is available at http://www.cygwin.com/ - -If you are using Cygwin or MinGW together with the MSYS environment, you -can build the library using configure (see "Unix ports" and -"Windows using configure" below). You can also -build wxWidgets without configure using native makefile, but only with -MinGW. Using Cygwin together with Windows makefile is no longer supported. - -If building with MinGW without configure: - --> Set your path so that it includes the directory - where your compiler and tools reside - --> Make sure you have GNU Make installed. It must be Windows native version. - Download it from http://www.mingw.org, the executable will be called - mingw32-make.exe. - --> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3), - but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will - have to change variable GCC_VERSION in config.gcc (see msw/install.txt - for details). - -If using configure, Unix instructions apply. - - -c) Build instructions - -Assuming that you installed the wxWidgets sources into c:\wxWidgets: - --> Copy c:\wxWidgets\include\wx\msw\setup0.h - to c:\wxWidgets\include\wx\msw\setup.h --> Edit c:\wxWidgets\include\wx\msw\setup.h to choose - the features you would like to compile wxWidgets with[out]. - - and std iostreams are disabled with - #define wxUSE_STD_IOSTREAM 0 - --> type: cd c:\wxWidgets\build\msw --> type: make -f makefile.gcc (if using GNU tools) -or type: nmake -f makefile.vc (if using MS VC++) -etc. - - See also docs/msw/install.txt for additional compilation options. - -d) Borland (including free command line tools) - Download tools from http://www.borland.com/downloads/ - - See docs/msw/install.txt for details; in brief: - --> type cd c:\wxWidgets\build\msw --> type make -f makefile.bcc - -You can customize many things in the build process, detailed description is -in docs/msw/install.txt. - - -II) Unix ports --------------- - -Building wxGTK or wxMotif completely without configure -won't ever work, but there is now a new makefile system -that works without libtool and automake, using only -configure to create what is needed. - -In order to create configure, you need to have the -GNU autoconf package (version > 2.54) installed -on your system and type run "autoconf" in the base -directory (or run the autogen.sh script in the same -directory, which just calls autoconf). Note that you usually don't -need to do this because configure is included in SVN. - -Set WXWIN environment variable to the base directory such -as ~/wxWidgets (this is actually not really needed). - --> type: export WXWIN=~/wxWidgets --> type: md mybuild --> type: cd mybuild --> type: ../configure --with-motif -or type: ../configure --with-gtk --> type: make --> type: su --> type: make install --> type: ldconfig --> type: exit - -Call configure with --disable-shared to create a static -library. Calling "make uninstall" will remove the installed -library and "make dist" will create a distribution (not -yet complete). - -III) Windows using configure ----------------------------------------- - -wxWidgets can be built on Windows using MSYS (see -http://www.mingw.org/), which is a POSIX build environment -for Windows. With MSYS you can just ./configure && make (see also VII, -Unix->Windows cross-compiling using configure). - -Of course, you can also build the library using plain makefiles (see -section I). - -V) MacOS X using configure and the Developer Tools ----------------------------------------- - -You need to have the Developer Tools installed. If this is not the case, -you will need to register at the Apple Developer web site (this is a free -registration) in order to download the Developer Tools installer. - -In order to create configure, you need to have the -GNU autoconf package (version >= 2.54) installed -on your system and type run "autoconf" in the base -directory (or run the autogen.sh script in the same -directory, which just calls autoconf). - --> type: mkdir macbuild --> type: cd macbuild --> type: ../configure --with-mac -or type: ../configure --> type: make - -VI) OS/2 ----------------------------------------- -No notes. - -VII) Unix->Windows cross-compiling using configure --------------------------------------------------- - -First you'll need a cross-compiler; linux glibc binaries of MinGW and -Cygwin (both based on egcs) can be found at -ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries, -based on the latest MinGW release can be found at -http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html -Otherwise you can compile one yourself. - -[ A Note about Cygwin and MinGW: the main difference is that Cygwin -binaries are always linked against cygwin.dll. This dll encapsulates most -standard Unix C extensions, which is very handy if you're porting unix -software to windows. However, wxMSW doesn't need this, so MinGW is -preferable if you write portable C(++). ] - -You might want to build both Unix and Windows binaries in the same source -tree; to do this make subdirs for each e.g. unix and win32. If you've -already build wxWidgets in the main dir, do a 'make distclean' there, -otherwise configure will get confused. (In any case, read the section 'Unix -using configure' and make sure you're able to build a native wxWidgets -library; cross-compiling errors can be pretty obscure and you'll want to be -sure that your configure setup is basically sound.) - -To cross compile the windows library, do --> cd win32 -(or whatever you called it) -Now run configure. There are two ways to do this --> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw -where --build= should read whatever platform you're building on. Configure -will notice that build and host platforms differ, and automatically prepend -i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!). -The other way to run configure is by specifying the names of the binaries -yourself: --> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \ - DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \ - ../configure --host=i586-mingw32 --with-mingw - -(all assuming you're using MinGW) -By default this will compile a DLL, if you want a static library, -specify --disable-shared. - -Type --> make -and wait, wait, wait. Don't leave the room, because the minute you do there -will be a compile error :-) - -NB: if you are using a very old compiler you risk to get quite a few warnings - about "ANSI C++ forbids implicit conversion from 'void *'" in all places - where va_arg macro is used. This is due to a bug in (some versions of) - MinGW headers which may be corrected by upgrading your compier, - otherwise you might edit the file - - ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h - - (instead of egcs-2.91.57 you may have something different), searching for - the lines - -/* Define __gnuc_va_list. */ - -#ifndef __GNUC_VA_LIST -#define __GNUC_VA_LIST -#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__) -typedef char *__gnuc_va_list; -#else -typedef void *__gnuc_va_list; -#endif -#endif - - and adding "|| defined(_WIN32)" to the list of platforms on which - __gnuc_va_list is char *. - -If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib -(or just libwx_msw.a if you opted for a static build). -Now try building the minimal sample: - --> cd samples/minimal --> make - -and run it with wine, for example (or copy to a Windows box) --> wine minimal.exe - -If all is well, do an install; from win32 --> make install - -Native and cross-compiled installations can co-exist peacefully -(as long as their widget sets differ), except for wx-config. You might -want to rename the cross-compiled one to i586-mingw32-wx-config, or something. - -Cross-compiling TODO: ---------------------- -- resource compiling must be done manually for now (should/can we link the -default wx resources into libwx_msw.a?) [ No we can't; the linker won't -link it in... you have to supply an object file ] -- static executables are HUGE -- there must be room for improvement. +Before building from svn sources under Windows, you need to copy the +file include/wx/msw/setup0.h to include/wx/msw/setup.h. This is +necessary in order to allow having local modifications to the latter +file without showing it as modified, as it is not under version +control. +After doing this, please proceed with the build as with any official +release, i.e. follow the instructions in the install.txt file in +docs/gtk, docs/msw and so on. diff --git a/build/msw/wx_vc10.sln b/build/msw/wx_vc10.sln index 77e59126b5..b3975e1d99 100644 --- a/build/msw/wx_vc10.sln +++ b/build/msw/wx_vc10.sln @@ -109,195 +109,383 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.ActiveCfg = Debug|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.Build.0 = Debug|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.Build.0 = DLL Release|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.ActiveCfg = Release|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.Build.0 = Release|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.ActiveCfg = Debug|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.Build.0 = Debug|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.Build.0 = DLL Debug|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.Build.0 = DLL Release|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.ActiveCfg = Release|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.Build.0 = Release|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.ActiveCfg = Debug|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.Build.0 = Debug|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.Build.0 = DLL Debug|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.Build.0 = DLL Release|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.ActiveCfg = Release|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.Build.0 = Release|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.ActiveCfg = Debug|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.Build.0 = Debug|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.Build.0 = DLL Debug|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.Build.0 = DLL Release|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.ActiveCfg = Release|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.Build.0 = Release|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.ActiveCfg = Debug|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.Build.0 = Debug|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.Build.0 = DLL Debug|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.Build.0 = DLL Release|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.ActiveCfg = Release|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.Build.0 = Release|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.ActiveCfg = Debug|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.Build.0 = Debug|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.Build.0 = DLL Debug|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.Build.0 = DLL Release|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.ActiveCfg = Release|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.Build.0 = Release|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.Build.0 = Debug|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.Build.0 = DLL Debug|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.Build.0 = DLL Release|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.Build.0 = Debug|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.Build.0 = DLL Debug|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.ActiveCfg = Debug|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.Build.0 = Debug|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.Build.0 = DLL Debug|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.Build.0 = DLL Release|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.ActiveCfg = Release|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.Build.0 = Release|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.Build.0 = Debug|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.Build.0 = DLL Debug|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.Build.0 = Debug|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.Build.0 = DLL Debug|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.Build.0 = Debug|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.Build.0 = DLL Debug|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.ActiveCfg = Debug|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.Build.0 = Debug|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.Build.0 = DLL Debug|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.Build.0 = DLL Release|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.ActiveCfg = Release|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.Build.0 = Release|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.Build.0 = Debug|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.Build.0 = DLL Debug|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.Build.0 = Debug|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.Build.0 = Debug|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.Build.0 = DLL Debug|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.Build.0 = Release|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.Build.0 = Debug|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.Build.0 = DLL Release|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.ActiveCfg = Debug|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.Build.0 = Debug|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.Build.0 = DLL Debug|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.Build.0 = DLL Release|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.ActiveCfg = Release|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.Build.0 = Release|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.Build.0 = Debug|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.Build.0 = DLL Debug|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.Build.0 = Debug|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.Build.0 = DLL Debug|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.Build.0 = DLL Release|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.ActiveCfg = Debug|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.Build.0 = Debug|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.Build.0 = DLL Debug|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.ActiveCfg = DLL Release|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.Build.0 = DLL Release|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.ActiveCfg = Release|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/msw/wx_vc10_adv.vcxproj b/build/msw/wx_vc10_adv.vcxproj index 75c4eb3237..a37e946719 100644 --- a/build/msw/wx_vc10_adv.vcxproj +++ b/build/msw/wx_vc10_adv.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + adv @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\adv\ + vc_x64_mswud\adv\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\adv\ + vc_x64_mswu\adv\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\adv\ + vc_x64_mswuddll\adv\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\adv\ + vc_x64_mswudll\adv\ false + false true + true wxmsw30ud_adv + wxmsw30ud_adv wxmsw30u_adv + wxmsw30u_adv wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_advlib.pch - vc_mswud\adv\ + $(OutDir)wxmsw30ud_adv.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_adv.lib + true + + + $(OutDir)wx_vc9_adv.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_advlib.pch $(OutDir)wxmsw30ud_adv.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_advlib.pch - vc_mswu\adv\ + $(OutDir)wxmsw30u_adv.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_adv.lib + true + + + $(OutDir)wx_vc9_adv.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_advlib.pch $(OutDir)wxmsw30u_adv.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_advdll.pch - vc_mswuddll\adv\ $(OutDir)wxmsw30ud_adv_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_advdll.pch + $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_adv_vc_x64_custom.dll + $(OutDir)wxmsw30ud_adv.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_adv.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_advdll.pch - vc_mswudll\adv\ $(OutDir)wxmsw30u_adv_vc_custom.pdb Level4 true @@ -242,6 +417,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_advdll.pch + $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_adv_vc_x64_custom.dll + $(OutDir)wxmsw30u_adv.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_adv.bsc + true + + @@ -249,9 +467,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -302,23 +524,37 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -327,21 +563,37 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -403,4 +655,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_aui.vcxproj b/build/msw/wx_vc10_aui.vcxproj index 6fc31f7ce2..8bfc1b49d5 100644 --- a/build/msw/wx_vc10_aui.vcxproj +++ b/build/msw/wx_vc10_aui.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + aui @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\aui\ + vc_x64_mswud\aui\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\aui\ + vc_x64_mswu\aui\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\aui\ + vc_x64_mswuddll\aui\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\aui\ + vc_x64_mswudll\aui\ false + false true + true wxmsw30ud_aui + wxmsw30ud_aui wxmsw30u_aui + wxmsw30u_aui wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_auilib.pch - vc_mswud\aui\ + $(OutDir)wxmsw30ud_aui.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_aui.lib + true + + + $(OutDir)wx_vc9_aui.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_auilib.pch $(OutDir)wxmsw30ud_aui.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_auilib.pch - vc_mswu\aui\ + $(OutDir)wxmsw30u_aui.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_aui.lib + true + + + $(OutDir)wx_vc9_aui.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_auilib.pch $(OutDir)wxmsw30u_aui.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_auidll.pch - vc_mswuddll\aui\ $(OutDir)wxmsw30ud_aui_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_auidll.pch + $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_aui_vc_x64_custom.dll + $(OutDir)wxmsw30ud_aui.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_aui.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_auidll.pch - vc_mswudll\aui\ $(OutDir)wxmsw30u_aui_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_auidll.pch + $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_aui_vc_x64_custom.dll + $(OutDir)wxmsw30u_aui.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_aui.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -260,41 +482,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -308,4 +560,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj index 2f86237d43..4e8ef861a2 100644 --- a/build/msw/wx_vc10_base.vcxproj +++ b/build/msw/wx_vc10_base.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + base @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\base\ + vc_x64_mswud\base\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\base\ + vc_x64_mswu\base\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\base\ + vc_x64_mswuddll\base\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\base\ + vc_x64_mswudll\base\ false + false true + true wxbase30ud + wxbase30ud wx$(ProjectName)30ud_vc_custom + wx$(ProjectName)30ud_vc_x64_custom wxbase30u + wxbase30u wx$(ProjectName)30u_vc_custom + wx$(ProjectName)30u_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_baselib.pch - vc_mswud\base\ + $(OutDir)wxbase30ud.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30ud.lib + true + + + $(OutDir)wx_vc9_base.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_baselib.pch $(OutDir)wxbase30ud.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_baselib.pch - vc_mswu\base\ + $(OutDir)wxbase30u.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30u.lib + true + + + $(OutDir)wx_vc9_base.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_baselib.pch $(OutDir)wxbase30u.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_basedll.pch - vc_mswuddll\base\ $(OutDir)wxbase30ud_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_basedll.pch + $(OutDir)wxbase30ud_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_vc_x64_custom.dll + $(OutDir)wxbase30ud.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30ud_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_base.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_basedll.pch - vc_mswudll\base\ $(OutDir)wxbase30u_vc_custom.pdb Level4 true @@ -242,6 +417,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_basedll.pch + $(OutDir)wxbase30u_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_vc_x64_custom.dll + $(OutDir)wxbase30u.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30u_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_base.bsc + true + + @@ -260,9 +478,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -273,12 +495,20 @@ + + + + + + + + @@ -375,23 +605,37 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -404,21 +648,37 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -596,4 +856,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj index 077b5b6fe6..ae336c3690 100644 --- a/build/msw/wx_vc10_core.vcxproj +++ b/build/msw/wx_vc10_core.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + core @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\core\ + vc_x64_mswud\core\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\core\ + vc_x64_mswu\core\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\core\ + vc_x64_mswuddll\core\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\core\ + vc_x64_mswudll\core\ false + false true + true wxmsw30ud_core + wxmsw30ud_core wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_core + wxmsw30u_core wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_corelib.pch - vc_mswud\core\ + $(OutDir)wxmsw30ud_core.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_core.lib + true + + + $(OutDir)wx_vc9_core.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_corelib.pch $(OutDir)wxmsw30ud_core.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_corelib.pch - vc_mswu\core\ + $(OutDir)wxmsw30u_core.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_core.lib + true + + + $(OutDir)wx_vc9_core.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_corelib.pch $(OutDir)wxmsw30u_core.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_coredll.pch - vc_mswuddll\core\ $(OutDir)wxmsw30ud_core_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_coredll.pch + $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_core_vc_x64_custom.dll + $(OutDir)wxmsw30ud_core.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_core.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_coredll.pch - vc_mswudll\core\ $(OutDir)wxmsw30u_core_vc_custom.pdb Level4 true @@ -242,6 +417,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_coredll.pch + $(OutDir)wxmsw30u_core_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_core_vc_x64_custom.dll + $(OutDir)wxmsw30u_core.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_core_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_core.bsc + true + + @@ -284,9 +502,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -383,9 +605,13 @@ vc_mswuddll\core\msw_accel.obj + vc_x64_mswuddll\core\msw_accel.obj vc_mswudll\core\msw_accel.obj + vc_x64_mswudll\core\msw_accel.obj vc_mswud\core\msw_accel.obj + vc_x64_mswud\core\msw_accel.obj vc_mswu\core\msw_accel.obj + vc_x64_mswu\core\msw_accel.obj @@ -396,35 +622,55 @@ vc_mswuddll\core\msw_bmpbuttn.obj + vc_x64_mswuddll\core\msw_bmpbuttn.obj vc_mswudll\core\msw_bmpbuttn.obj + vc_x64_mswudll\core\msw_bmpbuttn.obj vc_mswud\core\msw_bmpbuttn.obj + vc_x64_mswud\core\msw_bmpbuttn.obj vc_mswu\core\msw_bmpbuttn.obj + vc_x64_mswu\core\msw_bmpbuttn.obj vc_mswuddll\core\msw_button.obj + vc_x64_mswuddll\core\msw_button.obj vc_mswudll\core\msw_button.obj + vc_x64_mswudll\core\msw_button.obj vc_mswud\core\msw_button.obj + vc_x64_mswud\core\msw_button.obj vc_mswu\core\msw_button.obj + vc_x64_mswu\core\msw_button.obj vc_mswuddll\core\msw_checkbox.obj + vc_x64_mswuddll\core\msw_checkbox.obj vc_mswudll\core\msw_checkbox.obj + vc_x64_mswudll\core\msw_checkbox.obj vc_mswud\core\msw_checkbox.obj + vc_x64_mswud\core\msw_checkbox.obj vc_mswu\core\msw_checkbox.obj + vc_x64_mswu\core\msw_checkbox.obj vc_mswuddll\core\msw_checklst.obj + vc_x64_mswuddll\core\msw_checklst.obj vc_mswudll\core\msw_checklst.obj + vc_x64_mswudll\core\msw_checklst.obj vc_mswud\core\msw_checklst.obj + vc_x64_mswud\core\msw_checklst.obj vc_mswu\core\msw_checklst.obj + vc_x64_mswu\core\msw_checklst.obj vc_mswuddll\core\msw_choice.obj + vc_x64_mswuddll\core\msw_choice.obj vc_mswudll\core\msw_choice.obj + vc_x64_mswudll\core\msw_choice.obj vc_mswud\core\msw_choice.obj + vc_x64_mswud\core\msw_choice.obj vc_mswu\core\msw_choice.obj + vc_x64_mswu\core\msw_choice.obj @@ -432,15 +678,23 @@ vc_mswuddll\core\msw_combobox.obj + vc_x64_mswuddll\core\msw_combobox.obj vc_mswudll\core\msw_combobox.obj + vc_x64_mswudll\core\msw_combobox.obj vc_mswud\core\msw_combobox.obj + vc_x64_mswud\core\msw_combobox.obj vc_mswu\core\msw_combobox.obj + vc_x64_mswu\core\msw_combobox.obj vc_mswuddll\core\msw_control.obj + vc_x64_mswuddll\core\msw_control.obj vc_mswudll\core\msw_control.obj + vc_x64_mswudll\core\msw_control.obj vc_mswud\core\msw_control.obj + vc_x64_mswud\core\msw_control.obj vc_mswu\core\msw_control.obj + vc_x64_mswu\core\msw_control.obj @@ -452,9 +706,13 @@ vc_mswuddll\core\msw_dialog.obj + vc_x64_mswuddll\core\msw_dialog.obj vc_mswudll\core\msw_dialog.obj + vc_x64_mswudll\core\msw_dialog.obj vc_mswud\core\msw_dialog.obj + vc_x64_mswud\core\msw_dialog.obj vc_mswu\core\msw_dialog.obj + vc_x64_mswu\core\msw_dialog.obj @@ -467,9 +725,13 @@ vc_mswuddll\core\msw_fdrepdlg.obj + vc_x64_mswuddll\core\msw_fdrepdlg.obj vc_mswudll\core\msw_fdrepdlg.obj + vc_x64_mswudll\core\msw_fdrepdlg.obj vc_mswud\core\msw_fdrepdlg.obj + vc_x64_mswud\core\msw_fdrepdlg.obj vc_mswu\core\msw_fdrepdlg.obj + vc_x64_mswu\core\msw_fdrepdlg.obj @@ -479,9 +741,13 @@ vc_mswuddll\core\msw_gauge.obj + vc_x64_mswuddll\core\msw_gauge.obj vc_mswudll\core\msw_gauge.obj + vc_x64_mswudll\core\msw_gauge.obj vc_mswud\core\msw_gauge.obj + vc_x64_mswud\core\msw_gauge.obj vc_mswu\core\msw_gauge.obj + vc_x64_mswu\core\msw_gauge.obj @@ -495,23 +761,35 @@ vc_mswuddll\core\msw_listbox.obj + vc_x64_mswuddll\core\msw_listbox.obj vc_mswudll\core\msw_listbox.obj + vc_x64_mswudll\core\msw_listbox.obj vc_mswud\core\msw_listbox.obj + vc_x64_mswud\core\msw_listbox.obj vc_mswu\core\msw_listbox.obj + vc_x64_mswu\core\msw_listbox.obj vc_mswuddll\core\msw_listctrl.obj + vc_x64_mswuddll\core\msw_listctrl.obj vc_mswudll\core\msw_listctrl.obj + vc_x64_mswudll\core\msw_listctrl.obj vc_mswud\core\msw_listctrl.obj + vc_x64_mswud\core\msw_listctrl.obj vc_mswu\core\msw_listctrl.obj + vc_x64_mswu\core\msw_listctrl.obj vc_mswuddll\core\msw_menu.obj + vc_x64_mswuddll\core\msw_menu.obj vc_mswudll\core\msw_menu.obj + vc_x64_mswudll\core\msw_menu.obj vc_mswud\core\msw_menu.obj + vc_x64_mswud\core\msw_menu.obj vc_mswu\core\msw_menu.obj + vc_x64_mswu\core\msw_menu.obj @@ -523,9 +801,13 @@ vc_mswuddll\core\msw_notebook.obj + vc_x64_mswuddll\core\msw_notebook.obj vc_mswudll\core\msw_notebook.obj + vc_x64_mswudll\core\msw_notebook.obj vc_mswud\core\msw_notebook.obj + vc_x64_mswud\core\msw_notebook.obj vc_mswu\core\msw_notebook.obj + vc_x64_mswu\core\msw_notebook.obj @@ -539,88 +821,140 @@ vc_mswuddll\core\msw_radiobox.obj + vc_x64_mswuddll\core\msw_radiobox.obj vc_mswudll\core\msw_radiobox.obj + vc_x64_mswudll\core\msw_radiobox.obj vc_mswud\core\msw_radiobox.obj + vc_x64_mswud\core\msw_radiobox.obj vc_mswu\core\msw_radiobox.obj + vc_x64_mswu\core\msw_radiobox.obj vc_mswuddll\core\msw_radiobut.obj + vc_x64_mswuddll\core\msw_radiobut.obj vc_mswudll\core\msw_radiobut.obj + vc_x64_mswudll\core\msw_radiobut.obj vc_mswud\core\msw_radiobut.obj + vc_x64_mswud\core\msw_radiobut.obj vc_mswu\core\msw_radiobut.obj + vc_x64_mswu\core\msw_radiobut.obj vc_mswuddll\core\msw_scrolbar.obj + vc_x64_mswuddll\core\msw_scrolbar.obj vc_mswudll\core\msw_scrolbar.obj + vc_x64_mswudll\core\msw_scrolbar.obj vc_mswud\core\msw_scrolbar.obj + vc_x64_mswud\core\msw_scrolbar.obj vc_mswu\core\msw_scrolbar.obj + vc_x64_mswu\core\msw_scrolbar.obj vc_mswuddll\core\msw_slider.obj + vc_x64_mswuddll\core\msw_slider.obj vc_mswudll\core\msw_slider.obj + vc_x64_mswudll\core\msw_slider.obj vc_mswud\core\msw_slider.obj + vc_x64_mswud\core\msw_slider.obj vc_mswu\core\msw_slider.obj + vc_x64_mswu\core\msw_slider.obj vc_mswuddll\core\msw_spinbutt.obj + vc_x64_mswuddll\core\msw_spinbutt.obj vc_mswudll\core\msw_spinbutt.obj + vc_x64_mswudll\core\msw_spinbutt.obj vc_mswud\core\msw_spinbutt.obj + vc_x64_mswud\core\msw_spinbutt.obj vc_mswu\core\msw_spinbutt.obj + vc_x64_mswu\core\msw_spinbutt.obj vc_mswuddll\core\msw_statbmp.obj + vc_x64_mswuddll\core\msw_statbmp.obj vc_mswudll\core\msw_statbmp.obj + vc_x64_mswudll\core\msw_statbmp.obj vc_mswud\core\msw_statbmp.obj + vc_x64_mswud\core\msw_statbmp.obj vc_mswu\core\msw_statbmp.obj + vc_x64_mswu\core\msw_statbmp.obj vc_mswuddll\core\msw_statbox.obj + vc_x64_mswuddll\core\msw_statbox.obj vc_mswudll\core\msw_statbox.obj + vc_x64_mswudll\core\msw_statbox.obj vc_mswud\core\msw_statbox.obj + vc_x64_mswud\core\msw_statbox.obj vc_mswu\core\msw_statbox.obj + vc_x64_mswu\core\msw_statbox.obj vc_mswuddll\core\msw_statline.obj + vc_x64_mswuddll\core\msw_statline.obj vc_mswudll\core\msw_statline.obj + vc_x64_mswudll\core\msw_statline.obj vc_mswud\core\msw_statline.obj + vc_x64_mswud\core\msw_statline.obj vc_mswu\core\msw_statline.obj + vc_x64_mswu\core\msw_statline.obj vc_mswuddll\core\msw_stattext.obj + vc_x64_mswuddll\core\msw_stattext.obj vc_mswudll\core\msw_stattext.obj + vc_x64_mswudll\core\msw_stattext.obj vc_mswud\core\msw_stattext.obj + vc_x64_mswud\core\msw_stattext.obj vc_mswu\core\msw_stattext.obj + vc_x64_mswu\core\msw_stattext.obj vc_mswuddll\core\msw_textctrl.obj + vc_x64_mswuddll\core\msw_textctrl.obj vc_mswudll\core\msw_textctrl.obj + vc_x64_mswudll\core\msw_textctrl.obj vc_mswud\core\msw_textctrl.obj + vc_x64_mswud\core\msw_textctrl.obj vc_mswu\core\msw_textctrl.obj + vc_x64_mswu\core\msw_textctrl.obj vc_mswuddll\core\msw_textmeasure.obj + vc_x64_mswuddll\core\msw_textmeasure.obj vc_mswudll\core\msw_textmeasure.obj + vc_x64_mswudll\core\msw_textmeasure.obj vc_mswud\core\msw_textmeasure.obj + vc_x64_mswud\core\msw_textmeasure.obj vc_mswu\core\msw_textmeasure.obj + vc_x64_mswu\core\msw_textmeasure.obj vc_mswuddll\core\msw_tglbtn.obj + vc_x64_mswuddll\core\msw_tglbtn.obj vc_mswudll\core\msw_tglbtn.obj + vc_x64_mswudll\core\msw_tglbtn.obj vc_mswud\core\msw_tglbtn.obj + vc_x64_mswud\core\msw_tglbtn.obj vc_mswu\core\msw_tglbtn.obj + vc_x64_mswu\core\msw_tglbtn.obj vc_mswuddll\core\msw_toolbar.obj + vc_x64_mswuddll\core\msw_toolbar.obj vc_mswudll\core\msw_toolbar.obj + vc_x64_mswudll\core\msw_toolbar.obj vc_mswud\core\msw_toolbar.obj + vc_x64_mswud\core\msw_toolbar.obj vc_mswu\core\msw_toolbar.obj + vc_x64_mswu\core\msw_toolbar.obj @@ -634,9 +968,13 @@ true + true true + true true + true true + true @@ -646,39 +984,59 @@ true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true true + true @@ -687,17 +1045,25 @@ true + true true + true true + true true + true true + true true + true true + true true + true @@ -715,9 +1081,13 @@ vc_mswuddll\core\generic_statusbr.obj + vc_x64_mswuddll\core\generic_statusbr.obj vc_mswudll\core\generic_statusbr.obj + vc_x64_mswudll\core\generic_statusbr.obj vc_mswud\core\generic_statusbr.obj + vc_x64_mswud\core\generic_statusbr.obj vc_mswu\core\generic_statusbr.obj + vc_x64_mswu\core\generic_statusbr.obj @@ -731,23 +1101,37 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -802,21 +1186,37 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj index 37e4214668..b8edeac349 100644 --- a/build/msw/wx_vc10_gl.vcxproj +++ b/build/msw/wx_vc10_gl.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + gl @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\gl\ + vc_x64_mswud\gl\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\gl\ + vc_x64_mswu\gl\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\gl\ + vc_x64_mswuddll\gl\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\gl\ + vc_x64_mswudll\gl\ false + false true + true wxmsw30ud_gl + wxmsw30ud_gl wxmsw30u_gl + wxmsw30u_gl wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_gllib.pch - vc_mswud\gl\ + $(OutDir)wxmsw30ud_gl.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_gl.lib + true + + + $(OutDir)wx_vc9_gl.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_gllib.pch $(OutDir)wxmsw30ud_gl.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_gllib.pch - vc_mswu\gl\ + $(OutDir)wxmsw30u_gl.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_gl.lib + true + + + $(OutDir)wx_vc9_gl.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_gllib.pch $(OutDir)wxmsw30u_gl.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_gldll.pch - vc_mswuddll\gl\ $(OutDir)wxmsw30ud_gl_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_gldll.pch + $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_gl_vc_x64_custom.dll + $(OutDir)wxmsw30ud_gl.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_gl.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_gldll.pch - vc_mswudll\gl\ $(OutDir)wxmsw30u_gl_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_gldll.pch + $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_gl_vc_x64_custom.dll + $(OutDir)wxmsw30u_gl.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_gl.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -255,41 +477,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -297,4 +549,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_html.vcxproj b/build/msw/wx_vc10_html.vcxproj index 17a0ab5158..4b0debdf7a 100644 --- a/build/msw/wx_vc10_html.vcxproj +++ b/build/msw/wx_vc10_html.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + html @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\html\ + vc_x64_mswud\html\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\html\ + vc_x64_mswu\html\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\html\ + vc_x64_mswuddll\html\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\html\ + vc_x64_mswudll\html\ false + false true + true wxmsw30ud_html + wxmsw30ud_html wxmsw30u_html + wxmsw30u_html wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_htmllib.pch - vc_mswud\html\ + $(OutDir)wxmsw30ud_html.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_html.lib + true + + + $(OutDir)wx_vc9_html.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_htmllib.pch $(OutDir)wxmsw30ud_html.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_htmllib.pch - vc_mswu\html\ + $(OutDir)wxmsw30u_html.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_html.lib + true + + + $(OutDir)wx_vc9_html.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_htmllib.pch $(OutDir)wxmsw30u_html.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_htmldll.pch - vc_mswuddll\html\ $(OutDir)wxmsw30ud_html_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_htmldll.pch + $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_html_vc_x64_custom.dll + $(OutDir)wxmsw30ud_html.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_html.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_htmldll.pch - vc_mswudll\html\ $(OutDir)wxmsw30u_html_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_htmldll.pch + $(OutDir)wxmsw30u_html_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_html_vc_x64_custom.dll + $(OutDir)wxmsw30u_html.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_html_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_html.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -279,41 +501,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -338,4 +590,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_media.vcxproj b/build/msw/wx_vc10_media.vcxproj index a90472a829..31052935b7 100644 --- a/build/msw/wx_vc10_media.vcxproj +++ b/build/msw/wx_vc10_media.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + media @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\media\ + vc_x64_mswud\media\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\media\ + vc_x64_mswu\media\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\media\ + vc_x64_mswuddll\media\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\media\ + vc_x64_mswudll\media\ false + false true + true wxmsw30ud_media + wxmsw30ud_media wxmsw30u_media + wxmsw30u_media wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_medialib.pch - vc_mswud\media\ + $(OutDir)wxmsw30ud_media.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_media.lib + true + + + $(OutDir)wx_vc9_media.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_medialib.pch $(OutDir)wxmsw30ud_media.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_medialib.pch - vc_mswu\media\ + $(OutDir)wxmsw30u_media.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_media.lib + true + + + $(OutDir)wx_vc9_media.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_medialib.pch $(OutDir)wxmsw30u_media.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_mediadll.pch - vc_mswuddll\media\ $(OutDir)wxmsw30ud_media_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_mediadll.pch + $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_media_vc_x64_custom.dll + $(OutDir)wxmsw30ud_media.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_media.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_mediadll.pch - vc_mswudll\media\ $(OutDir)wxmsw30u_media_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_mediadll.pch + $(OutDir)wxmsw30u_media_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_media_vc_x64_custom.dll + $(OutDir)wxmsw30u_media.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_media_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_media.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -257,45 +479,75 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) - \ No newline at end of file + diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj index 1559865967..fc1855d07b 100644 --- a/build/msw/wx_vc10_net.vcxproj +++ b/build/msw/wx_vc10_net.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + net @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\net\ + vc_x64_mswud\net\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\net\ + vc_x64_mswu\net\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\net\ + vc_x64_mswuddll\net\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\net\ + vc_x64_mswudll\net\ false + false true + true wxbase30ud_net + wxbase30ud_net wxbase30u_net + wxbase30u_net wxbase30ud_$(ProjectName)_vc_custom + wxbase30ud_$(ProjectName)_vc_x64_custom wxbase30u_$(ProjectName)_vc_custom + wxbase30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_netlib.pch - vc_mswud\net\ + $(OutDir)wxbase30ud_net.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30ud_net.lib + true + + + $(OutDir)wx_vc9_net.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_netlib.pch $(OutDir)wxbase30ud_net.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_netlib.pch - vc_mswu\net\ + $(OutDir)wxbase30u_net.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30u_net.lib + true + + + $(OutDir)wx_vc9_net.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_netlib.pch $(OutDir)wxbase30u_net.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_netdll.pch - vc_mswuddll\net\ $(OutDir)wxbase30ud_net_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_netdll.pch + $(OutDir)wxbase30ud_net_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_net_vc_x64_custom.dll + $(OutDir)wxbase30ud_net.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30ud_net_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_net.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_netdll.pch - vc_mswudll\net\ $(OutDir)wxbase30u_net_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_netdll.pch + $(OutDir)wxbase30u_net_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_net_vc_x64_custom.dll + $(OutDir)wxbase30u_net.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30u_net_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_net.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -265,41 +487,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -316,4 +568,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_propgrid.vcxproj b/build/msw/wx_vc10_propgrid.vcxproj index fd89101d86..0a3e476389 100644 --- a/build/msw/wx_vc10_propgrid.vcxproj +++ b/build/msw/wx_vc10_propgrid.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + propgrid @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\propgrid\ + vc_x64_mswud\propgrid\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\propgrid\ + vc_x64_mswu\propgrid\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\propgrid\ + vc_x64_mswuddll\propgrid\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\propgrid\ + vc_x64_mswudll\propgrid\ false + false true + true wxmsw30ud_propgrid + wxmsw30ud_propgrid wxmsw30u_propgrid + wxmsw30u_propgrid wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_propgridlib.pch - vc_mswud\propgrid\ + $(OutDir)wxmsw30ud_propgrid.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_propgrid.lib + true + + + $(OutDir)wx_vc9_propgrid.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_propgridlib.pch $(OutDir)wxmsw30ud_propgrid.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_propgridlib.pch - vc_mswu\propgrid\ + $(OutDir)wxmsw30u_propgrid.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_propgrid.lib + true + + + $(OutDir)wx_vc9_propgrid.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_propgridlib.pch $(OutDir)wxmsw30u_propgrid.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_propgriddll.pch - vc_mswuddll\propgrid\ $(OutDir)wxmsw30ud_propgrid_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_propgriddll.pch + $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.dll + $(OutDir)wxmsw30ud_propgrid.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_propgrid.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_propgriddll.pch - vc_mswudll\propgrid\ $(OutDir)wxmsw30u_propgrid_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_propgriddll.pch + $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_propgrid_vc_x64_custom.dll + $(OutDir)wxmsw30u_propgrid.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_propgrid.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -261,41 +483,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -310,4 +562,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_qa.vcxproj b/build/msw/wx_vc10_qa.vcxproj index 13e2fd6178..503faefddb 100644 --- a/build/msw/wx_vc10_qa.vcxproj +++ b/build/msw/wx_vc10_qa.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + qa @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\qa\ + vc_x64_mswud\qa\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\qa\ + vc_x64_mswu\qa\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\qa\ + vc_x64_mswuddll\qa\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\qa\ + vc_x64_mswudll\qa\ false + false true + true wxmsw30ud_qa + wxmsw30ud_qa wxmsw30u_qa + wxmsw30u_qa wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_qalib.pch - vc_mswud\qa\ + $(OutDir)wxmsw30ud_qa.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_qa.lib + true + + + $(OutDir)wx_vc9_qa.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_qalib.pch $(OutDir)wxmsw30ud_qa.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_qalib.pch - vc_mswu\qa\ + $(OutDir)wxmsw30u_qa.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_qa.lib + true + + + $(OutDir)wx_vc9_qa.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_qalib.pch $(OutDir)wxmsw30u_qa.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_qadll.pch - vc_mswuddll\qa\ $(OutDir)wxmsw30ud_qa_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_qadll.pch + $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_qa_vc_x64_custom.dll + $(OutDir)wxmsw30ud_qa.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_qa.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_qadll.pch - vc_mswudll\qa\ $(OutDir)wxmsw30u_qa_vc_custom.pdb Level4 true @@ -242,58 +417,135 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_qadll.pch + $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_qa_vc_x64_custom.dll + $(OutDir)wxmsw30u_qa.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_qa.bsc + true + + Create + Create Create + Create Create + Create Create + Create true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) - \ No newline at end of file + diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj index 6ebc8825c1..3a389889a4 100644 --- a/build/msw/wx_vc10_ribbon.vcxproj +++ b/build/msw/wx_vc10_ribbon.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + ribbon @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\ribbon\ + vc_x64_mswud\ribbon\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\ribbon\ + vc_x64_mswu\ribbon\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\ribbon\ + vc_x64_mswuddll\ribbon\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\ribbon\ + vc_x64_mswudll\ribbon\ false + false true + true wxmsw30ud_ribbon + wxmsw30ud_ribbon wxmsw30u_ribbon + wxmsw30u_ribbon wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_ribbonlib.pch - vc_mswud\ribbon\ + $(OutDir)wxmsw30ud_ribbon.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_ribbon.lib + true + + + $(OutDir)wx_vc9_ribbon.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_ribbonlib.pch $(OutDir)wxmsw30ud_ribbon.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_ribbonlib.pch - vc_mswu\ribbon\ + $(OutDir)wxmsw30u_ribbon.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_ribbon.lib + true + + + $(OutDir)wx_vc9_ribbon.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_ribbonlib.pch $(OutDir)wxmsw30u_ribbon.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_ribbondll.pch - vc_mswuddll\ribbon\ $(OutDir)wxmsw30ud_ribbon_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_ribbondll.pch + $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.dll + $(OutDir)wxmsw30ud_ribbon.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_ribbon.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_ribbondll.pch - vc_mswudll\ribbon\ $(OutDir)wxmsw30u_ribbon_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_ribbondll.pch + $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_ribbon_vc_x64_custom.dll + $(OutDir)wxmsw30u_ribbon.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_ribbon.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -263,41 +485,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -312,4 +564,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_richtext.vcxproj b/build/msw/wx_vc10_richtext.vcxproj index 00a73de0ac..23576c854c 100644 --- a/build/msw/wx_vc10_richtext.vcxproj +++ b/build/msw/wx_vc10_richtext.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + richtext @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\richtext\ + vc_x64_mswud\richtext\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\richtext\ + vc_x64_mswu\richtext\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\richtext\ + vc_x64_mswuddll\richtext\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\richtext\ + vc_x64_mswudll\richtext\ false + false true + true wxmsw30ud_richtext + wxmsw30ud_richtext wxmsw30u_richtext + wxmsw30u_richtext wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_richtextlib.pch - vc_mswud\richtext\ + $(OutDir)wxmsw30ud_richtext.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_richtext.lib + true + + + $(OutDir)wx_vc9_richtext.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_richtextlib.pch $(OutDir)wxmsw30ud_richtext.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_richtextlib.pch - vc_mswu\richtext\ + $(OutDir)wxmsw30u_richtext.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_richtext.lib + true + + + $(OutDir)wx_vc9_richtext.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_richtextlib.pch $(OutDir)wxmsw30u_richtext.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_richtextdll.pch - vc_mswuddll\richtext\ $(OutDir)wxmsw30ud_richtext_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_richtextdll.pch + $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_richtext_vc_x64_custom.dll + $(OutDir)wxmsw30ud_richtext.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_richtext.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_richtextdll.pch - vc_mswudll\richtext\ $(OutDir)wxmsw30u_richtext_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_richtextdll.pch + $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_richtext_vc_x64_custom.dll + $(OutDir)wxmsw30u_richtext.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_richtext.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -263,41 +485,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -324,4 +576,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_stc.vcxproj b/build/msw/wx_vc10_stc.vcxproj index 4888343dd9..f66a7a570c 100644 --- a/build/msw/wx_vc10_stc.vcxproj +++ b/build/msw/wx_vc10_stc.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + stc @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\stc\ + vc_x64_mswud\stc\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\stc\ + vc_x64_mswu\stc\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\stc\ + vc_x64_mswuddll\stc\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\stc\ + vc_x64_mswudll\stc\ false + false true + true wxmsw30ud_stc + wxmsw30ud_stc wxmsw30u_stc + wxmsw30u_stc wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_stclib.pch - vc_mswud\stc\ + $(OutDir)wxmsw30ud_stc.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_stc.lib + true + + + $(OutDir)wx_vc9_stc.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_stclib.pch $(OutDir)wxmsw30ud_stc.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_stclib.pch - vc_mswu\stc\ + $(OutDir)wxmsw30u_stc.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_stc.lib + true + + + $(OutDir)wx_vc9_stc.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_stclib.pch $(OutDir)wxmsw30u_stc.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_stcdll.pch - vc_mswuddll\stc\ $(OutDir)wxmsw30ud_stc_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_stcdll.pch + $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_stc_vc_x64_custom.dll + $(OutDir)wxmsw30ud_stc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_stc.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_stcdll.pch - vc_mswudll\stc\ $(OutDir)wxmsw30u_stc_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_stcdll.pch + $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_stc_vc_x64_custom.dll + $(OutDir)wxmsw30u_stc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_stc.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -256,41 +478,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_webview.vcxproj b/build/msw/wx_vc10_webview.vcxproj index 37bd28da75..bb599911ba 100644 --- a/build/msw/wx_vc10_webview.vcxproj +++ b/build/msw/wx_vc10_webview.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + webview @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\webview\ + vc_x64_mswud\webview\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\webview\ + vc_x64_mswu\webview\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\webview\ + vc_x64_mswuddll\webview\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\webview\ + vc_x64_mswudll\webview\ false + false true + true wxmsw30ud_webview + wxmsw30ud_webview wxmsw30u_webview + wxmsw30u_webview wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_webviewlib.pch - vc_mswud\webview\ + $(OutDir)wxmsw30ud_webview.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_webview.lib + true + + + $(OutDir)wx_vc9_webview.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_webviewlib.pch $(OutDir)wxmsw30ud_webview.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_webviewlib.pch - vc_mswu\webview\ + $(OutDir)wxmsw30u_webview.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_webview.lib + true + + + $(OutDir)wx_vc9_webview.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_webviewlib.pch $(OutDir)wxmsw30u_webview.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_webviewdll.pch - vc_mswuddll\webview\ $(OutDir)wxmsw30ud_webview_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_webviewdll.pch + $(OutDir)wxmsw30ud_webview_vc_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_webview_vc_custom.dll + $(OutDir)wxmsw30ud_webview.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_webview_vc_custom.pdb + + + $(OutDir)wx_vc9_webview.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_webviewdll.pch - vc_mswudll\webview\ $(OutDir)wxmsw30u_webview_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_webviewdll.pch + $(OutDir)wxmsw30u_webview_vc_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_webview_vc_custom.dll + $(OutDir)wxmsw30u_webview.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_webview_vc_custom.pdb + true + true + + + $(OutDir)wx_vc9_webview.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -257,41 +479,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -302,4 +554,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_wxexpat.vcxproj b/build/msw/wx_vc10_wxexpat.vcxproj index a36edff0de..f4ca04a3fc 100644 --- a/build/msw/wx_vc10_wxexpat.vcxproj +++ b/build/msw/wx_vc10_wxexpat.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxexpat @@ -27,46 +43,84 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxexpat\ + vc_x64_mswud\wxexpat\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxexpat\ + vc_x64_mswu\wxexpat\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxexpat\ + vc_x64_mswuddll\wxexpat\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxexpat\ + vc_x64_mswudll\wxexpat\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -83,7 +137,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxexpat\ + $(OutDir)wxexpatd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + 0x0409 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpatd.lib + true + + + $(OutDir)wx_vc9_wxexpat.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir);%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxexpatd.pdb Level3 true @@ -116,7 +203,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxexpat\ + $(OutDir)wxexpat.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + 0x0409 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpat.lib + true + + + $(OutDir)wx_vc9_wxexpat.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir);%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxexpat.pdb Level3 true @@ -151,7 +269,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxexpat\ + $(OutDir)wxexpatd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + 0x0409 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpatd.lib + true + + + $(OutDir)wx_vc9_wxexpat.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir);%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxexpatd.pdb Level3 true @@ -184,7 +335,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxexpat\ + $(OutDir)wxexpat.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + 0x0409 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpat.lib + true + + + $(OutDir)wx_vc9_wxexpat.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir);%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxexpat.pdb Level3 true diff --git a/build/msw/wx_vc10_wxjpeg.vcxproj b/build/msw/wx_vc10_wxjpeg.vcxproj index 875449520a..e14ca341ca 100644 --- a/build/msw/wx_vc10_wxjpeg.vcxproj +++ b/build/msw/wx_vc10_wxjpeg.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxjpeg @@ -27,46 +43,84 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxjpeg\ + vc_x64_mswud\wxjpeg\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxjpeg\ + vc_x64_mswu\wxjpeg\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxjpeg\ + vc_x64_mswuddll\wxjpeg\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxjpeg\ + vc_x64_mswudll\wxjpeg\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -83,7 +137,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxjpeg\ + $(OutDir)wxjpegd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpegd.lib + true + + + $(OutDir)wx_vc9_wxjpeg.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxjpegd.pdb Level3 true @@ -116,7 +203,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxjpeg\ + $(OutDir)wxjpeg.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpeg.lib + true + + + $(OutDir)wx_vc9_wxjpeg.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxjpeg.pdb Level3 true @@ -151,7 +269,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxjpeg\ + $(OutDir)wxjpegd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpegd.lib + true + + + $(OutDir)wx_vc9_wxjpeg.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxjpegd.pdb Level3 true @@ -184,7 +335,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxjpeg\ + $(OutDir)wxjpeg.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpeg.lib + true + + + $(OutDir)wx_vc9_wxjpeg.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxjpeg.pdb Level3 true diff --git a/build/msw/wx_vc10_wxpng.vcxproj b/build/msw/wx_vc10_wxpng.vcxproj index 17a1f09c40..2ae5de47f5 100644 --- a/build/msw/wx_vc10_wxpng.vcxproj +++ b/build/msw/wx_vc10_wxpng.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxpng @@ -27,46 +43,84 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxpng\ + vc_x64_mswud\wxpng\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxpng\ + vc_x64_mswu\wxpng\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxpng\ + vc_x64_mswuddll\wxpng\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxpng\ + vc_x64_mswudll\wxpng\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -83,7 +137,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxpng\ + $(OutDir)wxpngd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxpngd.lib + true + + + $(OutDir)wx_vc9_wxpng.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\zlib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxpngd.pdb Level3 true @@ -116,7 +203,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxpng\ + $(OutDir)wxpng.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxpng.lib + true + + + $(OutDir)wx_vc9_wxpng.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\zlib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxpng.pdb Level3 true @@ -151,7 +269,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxpng\ + $(OutDir)wxpngd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxpngd.lib + true + + + $(OutDir)wx_vc9_wxpng.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\zlib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxpngd.pdb Level3 true @@ -184,7 +335,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxpng\ + $(OutDir)wxpng.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxpng.lib + true + + + $(OutDir)wx_vc9_wxpng.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\zlib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxpng.pdb Level3 true diff --git a/build/msw/wx_vc10_wxregex.vcxproj b/build/msw/wx_vc10_wxregex.vcxproj index 5909a6b3fa..55e47788d2 100644 --- a/build/msw/wx_vc10_wxregex.vcxproj +++ b/build/msw/wx_vc10_wxregex.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxregex @@ -28,51 +44,95 @@ false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxregex\ + vc_x64_mswud\wxregex\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxregex\ + vc_x64_mswu\wxregex\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxregex\ + vc_x64_mswuddll\wxregex\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxregex\ + vc_x64_mswudll\wxregex\ $(ProjectName)ud + $(ProjectName)ud $(ProjectName)ud + $(ProjectName)ud $(ProjectName)u + $(ProjectName)u $(ProjectName)u + $(ProjectName)u @@ -89,7 +149,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxregex\ + $(OutDir)wxregexud.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexud.lib + true + + + $(OutDir)wx_vc9_wxregex.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxregexud.pdb Level3 true @@ -122,7 +215,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxregex\ + $(OutDir)wxregexu.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexu.lib + true + + + $(OutDir)wx_vc9_wxregex.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxregexu.pdb Level3 true @@ -157,7 +281,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxregex\ + $(OutDir)wxregexud.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexud.lib + true + + + $(OutDir)wx_vc9_wxregex.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxregexud.pdb Level3 true @@ -190,7 +347,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxregex\ + $(OutDir)wxregexu.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexu.lib + true + + + $(OutDir)wx_vc9_wxregex.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxregexu.pdb Level3 true @@ -219,38 +407,66 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) - + \ No newline at end of file diff --git a/build/msw/wx_vc10_wxscintilla.vcxproj b/build/msw/wx_vc10_wxscintilla.vcxproj index d84e2c22e1..3e6dac77a6 100644 --- a/build/msw/wx_vc10_wxscintilla.vcxproj +++ b/build/msw/wx_vc10_wxscintilla.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxscintilla @@ -28,49 +44,91 @@ false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxscintilla\ + vc_x64_mswud\wxscintilla\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxscintilla\ + vc_x64_mswu\wxscintilla\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxscintilla\ + vc_x64_mswuddll\wxscintilla\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxscintilla\ + vc_x64_mswudll\wxscintilla\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -87,7 +145,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxscintilla\ + $(OutDir)wxscintillad.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintillad.lib + true + + + $(OutDir)wx_vc9_wxscintilla.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxscintillad.pdb Level3 true @@ -120,7 +211,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxscintilla\ + $(OutDir)wxscintilla.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintilla.lib + true + + + $(OutDir)wx_vc9_wxscintilla.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxscintilla.pdb Level3 true @@ -155,7 +277,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxscintilla\ + $(OutDir)wxscintillad.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintillad.lib + true + + + $(OutDir)wx_vc9_wxscintilla.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxscintillad.pdb Level3 true @@ -188,7 +343,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxscintilla\ + $(OutDir)wxscintilla.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintilla.lib + true + + + $(OutDir)wx_vc9_wxscintilla.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxscintilla.pdb Level3 true @@ -332,38 +518,66 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) - + \ No newline at end of file diff --git a/build/msw/wx_vc10_wxtiff.vcxproj b/build/msw/wx_vc10_wxtiff.vcxproj index 888fbd5f5e..4e06eb171c 100644 --- a/build/msw/wx_vc10_wxtiff.vcxproj +++ b/build/msw/wx_vc10_wxtiff.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxtiff @@ -27,46 +43,84 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxtiff\ + vc_x64_mswud\wxtiff\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxtiff\ + vc_x64_mswu\wxtiff\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxtiff\ + vc_x64_mswuddll\wxtiff\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxtiff\ + vc_x64_mswudll\wxtiff\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -83,7 +137,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxtiff\ + $(OutDir)wxtiffd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + $(OutDir)wxtiffd.lib + true + + + $(OutDir)wx_vc9_wxtiff.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxtiffd.pdb Level3 true @@ -116,7 +203,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxtiff\ + $(OutDir)wxtiff.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + $(OutDir)wxtiff.lib + true + + + $(OutDir)wx_vc9_wxtiff.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxtiff.pdb Level3 true @@ -151,7 +269,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxtiff\ + $(OutDir)wxtiffd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + $(OutDir)wxtiffd.lib + true + + + $(OutDir)wx_vc9_wxtiff.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxtiffd.pdb Level3 true @@ -184,7 +335,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxtiff\ + $(OutDir)wxtiff.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + $(OutDir)wxtiff.lib + true + + + $(OutDir)wx_vc9_wxtiff.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxtiff.pdb Level3 true diff --git a/build/msw/wx_vc10_wxzlib.vcxproj b/build/msw/wx_vc10_wxzlib.vcxproj index a9f3a53308..c21e20eb2d 100644 --- a/build/msw/wx_vc10_wxzlib.vcxproj +++ b/build/msw/wx_vc10_wxzlib.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxzlib @@ -27,49 +43,121 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxzlib\ + vc_x64_mswud\wxzlib\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxzlib\ + vc_x64_mswu\wxzlib\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxzlib\ + vc_x64_mswuddll\wxzlib\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxzlib\ + vc_x64_mswudll\wxzlib\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + %(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + $(OutDir)wxzlibd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlibd.lib + true + + + $(OutDir)wx_vc9_wxzlib.bsc + true + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) @@ -83,7 +171,6 @@ MultiThreadedDebugDLL true true - vc_mswud\wxzlib\ $(OutDir)wxzlibd.pdb Level3 true @@ -105,6 +192,38 @@ + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + %(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + $(OutDir)wxzlib.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlib.lib + true + + + $(OutDir)wx_vc9_wxzlib.bsc + true + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) @@ -116,7 +235,6 @@ Sync MultiThreadedDLL true - vc_mswu\wxzlib\ $(OutDir)wxzlib.pdb Level3 true @@ -138,6 +256,40 @@ + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + %(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + $(OutDir)wxzlibd.pdb + Level3 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlibd.lib + true + + + $(OutDir)wx_vc9_wxzlib.bsc + true + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) @@ -151,7 +303,6 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxzlib\ $(OutDir)wxzlibd.pdb Level3 true @@ -173,6 +324,38 @@ + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + %(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + $(OutDir)wxzlib.pdb + Level3 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlib.lib + true + + + $(OutDir)wx_vc9_wxzlib.bsc + true + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) @@ -184,7 +367,6 @@ Sync MultiThreadedDLL true - vc_mswudll\wxzlib\ $(OutDir)wxzlib.pdb Level3 true @@ -224,4 +406,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_xml.vcxproj b/build/msw/wx_vc10_xml.vcxproj index ae2af8dab8..5b474e0834 100644 --- a/build/msw/wx_vc10_xml.vcxproj +++ b/build/msw/wx_vc10_xml.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + xml @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\xml\ + vc_x64_mswud\xml\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\xml\ + vc_x64_mswu\xml\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\xml\ + vc_x64_mswuddll\xml\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\xml\ + vc_x64_mswudll\xml\ false + false true + true wxbase30ud_xml + wxbase30ud_xml wxbase30u_xml + wxbase30u_xml wxbase30ud_$(ProjectName)_vc_custom + wxbase30ud_$(ProjectName)_vc_x64_custom wxbase30u_$(ProjectName)_vc_custom + wxbase30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_xmllib.pch - vc_mswud\xml\ + $(OutDir)wxbase30ud_xml.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30ud_xml.lib + true + + + $(OutDir)wx_vc9_xml.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_xmllib.pch $(OutDir)wxbase30ud_xml.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_xmllib.pch - vc_mswu\xml\ + $(OutDir)wxbase30u_xml.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30u_xml.lib + true + + + $(OutDir)wx_vc9_xml.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_xmllib.pch $(OutDir)wxbase30u_xml.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_xmldll.pch - vc_mswuddll\xml\ $(OutDir)wxbase30ud_xml_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_xmldll.pch + $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_xml_vc_x64_custom.dll + $(OutDir)wxbase30ud_xml.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_xml.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_xmldll.pch - vc_mswudll\xml\ $(OutDir)wxbase30u_xml_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_xmldll.pch + $(OutDir)wxbase30u_xml_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_xml_vc_x64_custom.dll + $(OutDir)wxbase30u_xml.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30u_xml_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_xml.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -255,41 +477,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_xrc.vcxproj b/build/msw/wx_vc10_xrc.vcxproj index 6cf6aa8be6..5124806f6b 100644 --- a/build/msw/wx_vc10_xrc.vcxproj +++ b/build/msw/wx_vc10_xrc.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + xrc @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\xrc\ + vc_x64_mswud\xrc\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\xrc\ + vc_x64_mswu\xrc\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\xrc\ + vc_x64_mswuddll\xrc\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\xrc\ + vc_x64_mswudll\xrc\ false + false true + true wxmsw30ud_xrc + wxmsw30ud_xrc wxmsw30u_xrc + wxmsw30u_xrc wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_xrclib.pch - vc_mswud\xrc\ + $(OutDir)wxmsw30ud_xrc.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_xrc.lib + true + + + $(OutDir)wx_vc9_xrc.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_xrclib.pch $(OutDir)wxmsw30ud_xrc.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_xrclib.pch - vc_mswu\xrc\ + $(OutDir)wxmsw30u_xrc.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_xrc.lib + true + + + $(OutDir)wx_vc9_xrc.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_xrclib.pch $(OutDir)wxmsw30u_xrc.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_xrcdll.pch - vc_mswuddll\xrc\ $(OutDir)wxmsw30ud_xrc_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_xrcdll.pch + $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.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;wininet.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_xrc_vc_x64_custom.dll + $(OutDir)wxmsw30ud_xrc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb + + + $(OutDir)wx_vc9_xrc.bsc + true + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_xrcdll.pch - vc_mswudll\xrc\ $(OutDir)wxmsw30u_xrc_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_xrcdll.pch + $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.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;wininet.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_xrc_vc_x64_custom.dll + $(OutDir)wxmsw30u_xrc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_xrc.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -318,41 +540,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/tools/bld_chm_exe.bat b/build/tools/bld_chm_exe.bat old mode 100644 new mode 100755 diff --git a/build/tools/msvs/build2005.bat b/build/tools/msvs/build2005.bat new file mode 100755 index 0000000000..dd588e0f30 --- /dev/null +++ b/build/tools/msvs/build2005.bat @@ -0,0 +1,47 @@ +if "%1" == "" goto ERR_NOPARM +if "%2" == "" goto ERR_NOPARM +if "%3" == "" goto ERR_NOPARM + +cd c:\wxWidgets-%1.%2.%3\build\msw + +rem +rem Copy this file to the \wxwidgets-x.y.z\build\msw folder +rem +rem Open a Visual Studio 2005 command prompt. +rem +rem cd \wxwidgets-x.y.z\build\msw +rem build2005 +rem +rem ======================================================== + +rem Set the path if necessary. + +set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 8\VC\include;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\INCLUDE;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\INCLUDE\gl;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\INCLUDE\crt; +set LIB=C:\Program Files (x86)\Microsoft Visual Studio 8\VC\lib;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib\X64 +set LIBPATH=C:\Program Files (x86)\Microsoft Visual Studio 8\VC\lib;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib\AMD64 + +rem Remove the existing destination folders if the exist so that a complete rebuild occurs. + +rmdir vc80_mswudll /s /q +rmdir vc80_mswuddll /s /q +rmdir ..\..\lib\vc80_dll /s /q + +rem Delete the build output files from the last run, if any. + +del 2005x86_Debug.txt +del 2005x86_Release.txt + +nmake -f makefile.vc BUILD=debug SHARED=1 OFFICIAL_BUILD=1 COMPILER_VERSION=80 >> 2005x86_Debug.txt + +nmake -f makefile.vc BUILD=release SHARED=1 OFFICIAL_BUILD=1 COMPILER_VERSION=80 >> 2005x86_Release.txt + +goto End + +:ERR_NOPARM + @echo. + @echo ERROR: NO PARAMETER SUPPLIED + @echo MajorVers MinorVers BuildVers + +:End + +cd c:\wxWidgets diff --git a/build/tools/msvs/build2008.bat b/build/tools/msvs/build2008.bat new file mode 100755 index 0000000000..98f33e4c8b --- /dev/null +++ b/build/tools/msvs/build2008.bat @@ -0,0 +1,66 @@ +if "%1" == "" goto ERR_NOPARM +if "%2" == "" goto ERR_NOPARM +if "%3" == "" goto ERR_NOPARM + +cd c:\wxWidgets-%1.%2.%3\build\msw + +rem ================ VS 2008 Official Build =============== +rem +rem Copy this file to the \wxwidgets-x.y.z\build\msw folder +rem +rem Open a Windows SDK V6.1 command prompt. +rem +rem cd \wxwidgets-x.y.z\build\msw +rem build2008 +rem +rem ======================================================== + + +rem Remove the existing destination folders if the exist so that a complete rebuild occurs. + +rmdir vc90_mswudll /s /q +rmdir vc90_mswuddll /s /q +rmdir ..\..\lib\vc90_dll /s /q +rmdir vc90_mswudll_x64 /s /q +rmdir vc90_mswuddll_x64 /s /q +rmdir ..\..\lib\vc90_x64_dll /s /q + +rem Delete the build output files from the last run, if any. + +del 2008x86_Debug.txt +del 2008x86_Release.txt +del 2008x64_Debug.txt +del 2008x64_Release.txt + +rem 32 bit debug build +rem ------------------ + +call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X86 /Debug +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=90 OFFICIAL_BUILD=1 >> 2008x86_Debug.txt + +rem 32 bit release build +rem ------------------ +call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X86 /Release +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=90 OFFICIAL_BUILD=1 >> 2008x86_Release.txt + + +rem 64 bit debug build +rem ------------------ +call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X64 /Debug +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=90 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2008x64_Debug.txt + +rem 64 bit release build +rem ------------------ +call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X64 /Release +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=90 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2008x64_Release.txt + +goto End + +:ERR_NOPARM + @echo. + @echo ERROR: NO PARAMETER SUPPLIED + @echo MajorVers MinorVers BuildVers + +:End + +cd c:\wxWidgets diff --git a/build/tools/msvs/build2010.bat b/build/tools/msvs/build2010.bat new file mode 100755 index 0000000000..6cdec9e53c --- /dev/null +++ b/build/tools/msvs/build2010.bat @@ -0,0 +1,65 @@ +if "%1" == "" goto ERR_NOPARM +if "%2" == "" goto ERR_NOPARM +if "%3" == "" goto ERR_NOPARM + +cd c:\wxWidgets-%1.%2.%3\build\msw + +rem ================ VS 2010 Official Build =============== +rem +rem Copy this file to the \wxwidgets-x.y.z\build\msw folder +rem +rem Open a Windows SDK V7.1 command prompt. +rem +rem cd \wxwidgets-x.y.z\build\msw +rem build2010 +rem +rem ======================================================== + +rem Remove the existing destination folders if the exist so that a complete rebuild occurs. + +rmdir vc100_mswuddll /s /q +rmdir vc100_mswuddll_x64 /s /q +rmdir vc100_mswudll /s /q +rmdir vc100_mswudll_x64 /s /q + +rmdir ..\..\lib\vc100_dll /s /q +rmdir ..\..\lib\vc100_x64_dll /s /q + +rem Delete the build output files from the last run, if any. + +del 2010x86_Debug.txt +del 2010x86_Release.txt +del 2010x64_Debug.txt +del 2010x64_Release.txt + + +rem 64 bit release build +rem ------------------ +call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X64 /Release +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=100 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2010x64_Release.txt + +rem 32 bit release build +rem ------------------ +call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X86 /Release +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=100 OFFICIAL_BUILD=1 >> 2010x86_Release.txt + +rem 64 bit debug build +rem ------------------ +call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X64 /Debug +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=100 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2010x64_Debug.txt + +rem 64 bit release build +rem ------------------ +call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X86 /Debug +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=100 OFFICIAL_BUILD=1 >> 2010x86_Debug.txt + +goto End + +:ERR_NOPARM + @echo. + @echo ERROR: NO PARAMETER SUPPLIED + @echo MajorVers MinorVers BuildVers + +:End + +cd c:\wxWidgets diff --git a/build/tools/msvs/build2012.bat b/build/tools/msvs/build2012.bat new file mode 100755 index 0000000000..9e3d1fb77d --- /dev/null +++ b/build/tools/msvs/build2012.bat @@ -0,0 +1,64 @@ +if "%1" == "" goto ERR_NOPARM +if "%2" == "" goto ERR_NOPARM +if "%3" == "" goto ERR_NOPARM + +cd c:\wxWidgets-%1.%2.%3\build\msw + +rem ================ VS 2012 Official Build =============== +rem +rem Copy this file to the \wxwidgets-x.y.z\build\msw folder +rem +rem Open a Visual Studio 2012 Developer command prompt. +rem +rem cd \wxwidgets-x.y.z\build\msw +rem build2012 +rem +rem ======================================================== + +rem Remove the existing destination folders if the exist so that a complete rebuild occurs. + +rmdir vc110_mswuddll /s /q +rmdir vc110_mswuddll_x64 /s /q +rmdir vc110_mswudll /s /q +rmdir vc110_mswudll_x64 /s /q + +rmdir ..\..\lib\vc110_dll /s /q +rmdir ..\..\lib\vc110_x64_dll /s /q + +rem Delete the build output files from the last run, if any. + +del 2012x86_Debug.txt +del 2012x86_Release.txt +del 2012x64_Debug.txt +del 2012x64_Release.txt + +call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat" + +rem 64 bit release build +rem ------------------ +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=110 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2012x64_Release.txt + +rem 64 bit debug build +rem ------------------ +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=110 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2012x64_Debug.txt + +call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat" + +rem 32 bit release build +rem ------------------ +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=110 OFFICIAL_BUILD=1 >> 2012x86_Release.txt + +rem 32 bit debug build +rem ------------------ +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=110 OFFICIAL_BUILD=1 >> 2012x86_Debug.txt + +goto End + +:ERR_NOPARM + @echo. + @echo ERROR: NO PARAMETER SUPPLIED + @echo MajorVers MinorVers BuildVers + +:End + +cd c:\wxWidgets diff --git a/build/tools/msvs/build2013.bat b/build/tools/msvs/build2013.bat new file mode 100755 index 0000000000..6f917648ff --- /dev/null +++ b/build/tools/msvs/build2013.bat @@ -0,0 +1,64 @@ +if "%1" == "" goto ERR_NOPARM +if "%2" == "" goto ERR_NOPARM +if "%3" == "" goto ERR_NOPARM + +cd c:\wxWidgets-%1.%2.%3\build\msw + +rem ================ VS 2013 Official Build =============== +rem +rem Copy this file to the \wxwidgets-x.y.z\build\msw folder +rem +rem Open a Visual Studio 2013 Developer command prompt. +rem +rem cd \wxwidgets-x.y.z\build\msw +rem build2013 +rem +rem ======================================================== + +rem Remove the existing destination folders if the exist so that a complete rebuild occurs. + +rmdir vc120_mswuddll /s /q +rmdir vc120_mswuddll_x64 /s /q +rmdir vc120_mswudll /s /q +rmdir vc120_mswudll_x64 /s /q + +rmdir ..\..\lib\vc120_dll /s /q +rmdir ..\..\lib\vc120_x64_dll /s /q + +rem Delete the build output files from the last run, if any. + +del 2013x86_Debug.txt +del 2013x86_Release.txt +del 2013x64_Debug.txt +del 2013x64_Release.txt + +call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat" + +rem 64 bit release build +rem ------------------ +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=120 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2013x64_Release.txt + +rem 64 bit debug build +rem ------------------ +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=120 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2013x64_Debug.txt + +call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat" + +rem 32 bit release build +rem ------------------ +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=120 OFFICIAL_BUILD=1 >> 2013x86_Release.txt + +rem 32 bit debug build +rem ------------------ +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=120 OFFICIAL_BUILD=1 >> 2013x86_Debug.txt + +goto End + +:ERR_NOPARM + @echo. + @echo ERROR: NO PARAMETER SUPPLIED + @echo MajorVers MinorVers BuildVers + +:End + +cd c:\wxWidgets diff --git a/build/tools/msvs/package.bat b/build/tools/msvs/package.bat new file mode 100755 index 0000000000..c026158890 --- /dev/null +++ b/build/tools/msvs/package.bat @@ -0,0 +1,163 @@ +rem ============= VS Binaries Packaging Script ============= +rem +rem Copy this file to the \wxwidgets-x.y.z\build\msw folder +rem +rem Open a command prompt. +rem +rem cd \wxwidgets-x.y.z\build\msw +rem package major minor revision +rem +rem ======================================================== + +if "%1" == "" goto ERR_NOPARM +if "%2" == "" goto ERR_NOPARM +if "%3" == "" goto ERR_NOPARM + +rem Add path info if necessary. + +path=%path%;"C:\Program Files\7-Zip" + +set wxMajor=%1 +set wxMinor=%2 +set wxBuild=%3 + +set wxPath=\wxWidgets-%wxMajor%.%wxMinor%.%wxBuild% +set wxLibVers=%1%2 + +if "%2" == "9" set wxDLLVers=%1%2%3 +if NOT "%2" == "9" set wxDLLVers=%1%2 + +rem Switch to install directory so 7z files are relative to the folder. + +cd %wxPath% + +rem Package the VS 2005 files. +rem -------------------------- + +rem Get rid of any files from the last run. + +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_Dev.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_ReleaseDLL.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_ReleasePDB.7z + +rem 7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_Dev.7z lib\vc80_dll\mswud lib\vc80_dll\mswu lib\vc80_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc80_dll\wxbase%wxDllVers%ud_*.pdb lib\vc80_dll\wxMSW%wxDllVers%ud_*.dll lib\vc80_dll\wxbase%wxDllVers%u*.dll lib\vc80_dll\*.lib +rem 7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_ReleaseDLL.7z lib\vc80_dll\wxMSW%wxDllVers%u_*.dll lib\vc80_dll\wxbase%wxDllVers%u_*.dll +rem 7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_ReleasePDB.7z lib\vc80_dll\wxMSW%wxDllVers%u_*.pdb lib\vc80_dll\wxbase%wxDllVers%u_*.pdb + +rem Package the VS 2008 32 bit files. +rem --------------------------------- + +rem Get rid of any files from the last run. + +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_Dev.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_ReleaseDLL.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_ReleasePDB.7z + +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_Dev.7z lib\vc90_dll\mswud lib\vc90_dll\mswu lib\vc90_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc90_dll\wxbase%wxDllVers%ud_*.pdb lib\vc90_dll\wxMSW%wxDllVers%ud_*.dll lib\vc90_dll\wxbase%wxDllVers%ud_*.dll lib\vc90_dll\*.lib +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_ReleaseDLL.7z lib\vc90_dll\wxMSW%wxDllVers%u_*.dll lib\vc90_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_ReleasePDB.7z lib\vc90_dll\wxMSW%wxDllVers%u_*.pdb lib\vc90_dll\wxbase%wxDllVers%u*_.pdb + +rem Package the VS 2010 32 bit files. +rem ---------------------------------- + +rem Get rid of any files from the last run. + +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_Dev.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_ReleaseDLL.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_ReleasePDB.7z + +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_Dev.7z lib\vc100_dll\mswud lib\vc100_dll\mswu lib\vc100_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc100_dll\wxbase%wxDllVers%ud_*.pdb lib\vc100_dll\wxMSW%wxDllVers%ud_*.dll lib\vc100_dll\wxbase%wxDllVers%ud_*.dll lib\vc100_dll\*.lib +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_ReleaseDLL.7z lib\vc100_dll\wxMSW%wxDllVers%u_*.dll lib\vc100_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_ReleasePDB.7z lib\vc100_dll\wxMSW%wxDllVers%u_*.pdb lib\vc100_dll\wxbase%wxDllVers%u_*.pdb + +rem Package the VS 2012 32 bit files. +rem ---------------------------------- + +rem Get rid of any files from the last run. + +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_Dev.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_ReleaseDLL.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_ReleasePDB.7z + +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_Dev.7z lib\vc110_dll\mswud lib\vc110_dll\mswu lib\vc110_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc110_dll\wxbase%wxDllVers%ud_*.pdb lib\vc110_dll\wxMSW%wxDllVers%ud_*.dll lib\vc110_dll\wxbase%wxDllVers%ud_*.dll lib\vc110_dll\*.lib +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_ReleaseDLL.7z lib\vc110_dll\wxMSW%wxDllVers%u_*.dll lib\vc110_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_ReleasePDB.7z lib\vc110_dll\wxMSW%wxDllVers%u_*.pdb lib\vc110_dll\wxbase%wxDllVers%u_*.pdb + +rem Package the VS 2013 32 bit files. +rem ---------------------------------- + +rem Get rid of any files from the last run. + +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_Dev.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_ReleaseDLL.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_ReleasePDB.7z + +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_Dev.7z lib\vc120_dll\mswud lib\vc120_dll\mswu lib\vc120_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc120_dll\wxbase%wxDllVers%ud_*.pdb lib\vc120_dll\wxMSW%wxDllVers%ud_*.dll lib\vc120_dll\wxbase%wxDllVers%ud_*.dll lib\vc120_dll\*.lib +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_ReleaseDLL.7z lib\vc120_dll\wxMSW%wxDllVers%u_*.dll lib\vc120_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_ReleasePDB.7z lib\vc120_dll\wxMSW%wxDllVers%u_*.pdb lib\vc120_dll\wxbase%wxDllVers%u_*.pdb + + +rem Package the VS 2008 64 bit files. +rem --------------------------------- + +rem Get rid of any files from the last run. + +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_Dev.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_ReleaseDLL.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_ReleasePDB.7z + +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_Dev.7z lib\vc90_x64_dll\mswud lib\vc90_x64_dll\mswu lib\vc90_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc90_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\vc90_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\vc90_x64_dll\wxbase%wxDllVers%ud_*.dll lib\vc90_x64_dll\*.lib +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_ReleaseDLL.7z lib\vc90_x64_dll\wxMSW%wxDllVers%u_*.dll lib\vc90_x64_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_ReleasePDB.7z lib\vc90_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\vc90_x64_dll\wxbase%wxDllVers%u_*.pdb + +rem Package the VS 2010 64 bit files. +rem --------------------------------- + +rem Get rid of any files from the last run. + +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_Dev.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_ReleaseDLL.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_ReleasePDB.7z + +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_Dev.7z lib\vc100_x64_dll\mswud lib\vc100_x64_dll\mswu lib\vc100_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc100_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\vc100_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\vc100_x64_dll\wxbase%wxDllVers%ud_*.dll lib\vc100_x64_dll\*.lib +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_ReleaseDLL.7z lib\vc100_x64_dll\wxMSW%wxDllVers%u_*.dll lib\vc100_x64_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_ReleasePDB.7z lib\vc100_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\vc100_x64_dll\wxbase%wxDllVers%u_*.pdb + +rem Package the VS 2012 64 bit files. +rem --------------------------------- + +rem Get rid of any files from the last run. + +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_Dev.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_ReleaseDLL.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_ReleasePDB.7z + +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_Dev.7z lib\vc110_x64_dll\mswud lib\vc110_x64_dll\mswu lib\vc110_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc110_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\vc110_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\vc110_x64_dll\wxbase%wxDllVers%ud_*.dll lib\vc110_x64_dll\*.lib +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_ReleaseDLL.7z lib\vc110_x64_dll\wxMSW%wxDllVers%u_*.dll lib\vc110_x64_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_ReleasePDB.7z lib\vc110_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\vc110_x64_dll\wxbase%wxDllVers%u_*.pdb + + +rem Package the VS 2013 64 bit files. +rem --------------------------------- + +rem Get rid of any files from the last run. + +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_Dev.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_ReleaseDLL.7z +del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_ReleasePDB.7z + +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_Dev.7z lib\vc120_x64_dll\mswud lib\vc120_x64_dll\mswu lib\vc120_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc120_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\vc120_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\vc120_x64_dll\wxbase%wxDllVers%ud_*.dll lib\vc120_x64_dll\*.lib +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_ReleaseDLL.7z lib\vc120_x64_dll\wxMSW%wxDllVers%u_*.dll lib\vc120_x64_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_ReleasePDB.7z lib\vc120_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\vc120_x64_dll\wxbase%wxDllVers%u_*.pdb + + +goto End + +:ERR_NOPARM + @echo. + @echo ERROR: NO PARAMETER SUPPLIED + @echo MajorVers MinorVers BuildVers + +:End + +cd \wxWidgets diff --git a/configure b/configure index 44ef5ddd8e..cb15f8600d 100755 --- a/configure +++ b/configure @@ -2310,7 +2310,7 @@ Optional Packages: --with-osx_carbon use Mac OS X (Carbon) --with-osx_cocoa use Mac OS X (Cocoa) --with-osx_iphone use iPhone OS X port - --with-osx use Mac OS X (default port, currently Carbon) + --with-osx use Mac OS X (default port, Cocoa) --with-carbon same as --with-osx_carbon --with-cocoa same as --with-osx_cocoa --with-iphone same as --with-osx_iphone @@ -4517,7 +4517,7 @@ fi # Check whether --with-osx was given. if test "${with_osx+set}" = set; then : - withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 + withval=$with_osx; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1 fi @@ -4541,7 +4541,7 @@ fi # Check whether --with-mac was given. if test "${with_mac+set}" = set; then : - withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 + withval=$with_mac; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1 fi diff --git a/configure.in b/configure.in index 33832fe8c9..53ccfe0ddc 100644 --- a/configure.in +++ b/configure.in @@ -468,11 +468,11 @@ AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE AC_ARG_WITH(osx_carbon, [ --with-osx_carbon use Mac OS X (Carbon)], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(osx_cocoa, [ --with-osx_cocoa use Mac OS X (Cocoa)], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(osx_iphone, [ --with-osx_iphone use iPhone OS X port], [wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1]) -AC_ARG_WITH(osx, [ --with-osx use Mac OS X (default port, currently Carbon)], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1]) +AC_ARG_WITH(osx, [ --with-osx use Mac OS X (default port, Cocoa)], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(carbon, [ --with-carbon same as --with-osx_carbon], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(cocoa, [ --with-cocoa same as --with-osx_cocoa], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(iphone, [ --with-iphone same as --with-osx_iphone], [wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1]) -AC_ARG_WITH(mac, [ --with-mac same as --with-osx], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1]) +AC_ARG_WITH(mac, [ --with-mac same as --with-osx], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(old_cocoa, [ --with-old_cocoa use old, deprecated, Cocoa port], [wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(wine, [ --with-wine use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1]) AC_ARG_WITH(msw, [ --with-msw use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1]) diff --git a/docs/changes.txt b/docs/changes.txt index f820ed0e2a..bc57b6eb0e 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -239,6 +239,9 @@ Changes in behaviour not resulting in compilation errors, please read this! - wxAny now uses C locale format for the floating point numbers and not the current locale one, i.e. decimal point is always used. +- wxGridBagSizer::AddGrowable{Col,Row}() must now be called after the items are + added to the sizer, i.e. the columns and rows already exist. + Changes in behaviour which may result in compilation errors ----------------------------------------------------------- @@ -567,7 +570,24 @@ Major new features in this release was added. -3.0-RC2: (released 2013-10-xx) +3.0.0: (released 2013-11-11) +---------------------------- + +All: + +- Fix crash if wxCharBuffer fails to allocate the requested amount of memory. + +wxGTK: + +- Fix wxSpinButton default width under GTK+ 3 (David Hart). + +wxMSW: + +- Compilation fix for WXWIN_COMPATIBILITY_2_6=1 case (Tim Stahlhut). +- Fix behaviour of wxComboBox using ID=1000. + + +3.0-RC2: (released 2013-10-28) ------------------------------ All: @@ -674,7 +694,7 @@ All: - Add separate read/written bytes counters and per-direction NOWAIT and WAITALL flags to wxSocket (Rob Bresalier). - Add wxEventLoop::ScheduleExit() (Rob Bresalier). -- Add wxProcess::SetPriority() (Marian Meravy). +- Add wxProcess::SetPriority() (Marián "VooDooMan" Meravý). - Add wxDir::Close() method (Silverstorm82). - Fix wxDateTime::GetWeekOfYear() for the last week of year (aimo). - Fix compilation of wxHash{Map,Set} with g++ 4.7 (Nathan Ridge). diff --git a/docs/doxygen/groups/class.h b/docs/doxygen/groups/class.h index 861a1cb9c1..535323be80 100644 --- a/docs/doxygen/groups/class.h +++ b/docs/doxygen/groups/class.h @@ -7,7 +7,7 @@ /** -@defgroup group_class Full Class List by Category +@defgroup group_class Class List by Category This group contains all full class list groups. The @ref page_class_cat provides a quick summary of these groups on one page. diff --git a/docs/doxygen/mainpages/cat_classes.h b/docs/doxygen/mainpages/cat_classes.h index 145b46aa24..237af60876 100644 --- a/docs/doxygen/mainpages/cat_classes.h +++ b/docs/doxygen/mainpages/cat_classes.h @@ -7,12 +7,13 @@ /** -@page page_class_cat Summarized Class List by Category +@page page_class_cat Overview of Available Classes @tableofcontents This page contains a summarized listing of classes, please see the -@ref group_class page for a full listing. +@ref group_class page for a full listing by category or the +full list of classes in alphabetical order. diff --git a/docs/doxygen/mainpages/copyright.h b/docs/doxygen/mainpages/copyright.h index 3fc7f3e529..245983246b 100644 --- a/docs/doxygen/mainpages/copyright.h +++ b/docs/doxygen/mainpages/copyright.h @@ -9,8 +9,11 @@ @page page_copyright Copyrights and Licenses -Copyright (c) 1992-2012 Julian Smart, Robert Roebling, Vadim Zeitlin and other -members of the wxWidgets team +@section section_copyright wxWidgets Copyrights and Licenses + +Copyright (c) 1992-2013 Julian Smart, Vadim Zeitlin, Stefan Csomor, Robert +Roebling, and other members of the wxWidgets team, please see the +acknowledgements section below. Portions (c) 1996 Artificial Intelligence Applications Institute @@ -24,6 +27,72 @@ recognition of the new name by OSI. @li @subpage page_copyright_xserver +@section section_acknowledgements Acknowledgements + +The following is the list of the core, active developers of wxWidgets which keep +it running and have provided an invaluable, extensive and high-quality amount of +changes over the many of years of wxWidgets' life: + +@li Julian Smart +@li Vadim Zeitlin +@li Robert Roebling +@li Robin Dunn +@li Stefan Csomor +@li Vaclav Slavik +@li Paul Cornett +@li Wlodzimierz `ABX' Skiba +@li Chris Elliott +@li David Elliott +@li Kevin Hock +@li Stefan Neis +@li Michael Wetherell + +We would particularly like to thank the following peoples for their contributions +to wxWidgets, and the many others who have been involved in the project over the years. +Apologies for any unintentional omissions from this alphabetic list: + +Yiorgos Adamopoulos, Jamshid Afshar, Alejandro Aguilar-Sierra, AIAI, +Patrick Albert, Karsten Ballueder, Mattia Barbon, Michael Bedward, +Kai Bendorf, Yura Bidus, Keith Gary Boyce, Chris Breeze, Pete Britton, +Ian Brown, C. Buckley, Marco Cavallini, Dmitri Chubraev, Robin Corbet, Cecil Coupe, +Andrew Davison, Gilles Depeyrot, Neil Dudman, Hermann Dunkel, Jos van Eijndhoven, +Tom Felici, Thomas Fettig, Matthew Flatt, Pasquale Foggia, Josep Fortiana, Todd Fries, +Dominic Gallagher, Guillermo Rodriguez Garcia, Wolfram Gloger, Norbert Grotz, +Stefan Gunter, Bill Hale, Patrick Halke, Stefan Hammes, Guillaume Helle, +Harco de Hilster, Cord Hockemeyer, Markus Holzem, Olaf Klein, Leif Jensen, +Bart Jourquin, Guilhem Lavaux, Ron Lee, Jan Lessner, Nicholas Liebmann, +Torsten Liermann, Per Lindqvist, Francesco Montorsi, Thomas Runge, Tatu Männistö, +Scott Maxwell, Thomas Myers, Oliver Niedung, Ryan Norton, Hernan Otero, +Ian Perrigo, Timothy Peters, Giordano Pezzoli, Harri Pasanen, Thomaso Paoletti, +Garrett Potts, Marcel Rasche, Dino Scaringella, Jobst Schmalenbach, Arthur Seaton, +Paul Shirley, Stein Somers, Petr Smilauer, Neil Smith, Kari Systä, George Tasker, +Arthur Tetzlaff-Deas, Jonathan Tonberg, Jyrki Tuomi, Janos Vegh, Andrea Venturoli, +David Webster, Otto Wyss, Xiaokun Zhu, Edward Zimmermann. + +Many thanks also to AIAI for being willing to release the original version of +wxWidgets into the public domain, and to our patient partners. + +`Graphplace', the basis for the wxGraphLayout library, is copyright Dr. Jos +T.J. van Eijndhoven of Eindhoven University of Technology. The code has +been used in wxGraphLayout (not in wxWidgets anymore) with his permission. + +We also acknowledge the author of XFIG, the excellent Unix drawing tool, +from the source of which we have borrowed some spline drawing code. +His copyright is included below. + + +XFig2.1 is copyright (c) 1985 by Supoj Sutanthavibul. Permission to +use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of M.I.T. not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. M.I.T. makes no representations about the +suitability of this software for any purpose. It is provided ``as is'' +without express or implied warranty. + + @page page_copyright_wxlicense wxWindows Library Licence @verbinclude "licence.txt" diff --git a/docs/doxygen/mainpages/devtips.h b/docs/doxygen/mainpages/devtips.h index ac8f0bce37..b0b119e078 100644 --- a/docs/doxygen/mainpages/devtips.h +++ b/docs/doxygen/mainpages/devtips.h @@ -7,11 +7,11 @@ /** -@page page_multiplatform General Cross-Platform Development Tips +@page page_multiplatform Cross-Platform Development Tips @tableofcontents -This chapter describes some tips related to cross-platform development. +This chapter describes some general tips related to cross-platform development. @@ -128,7 +128,7 @@ On Windows using a compiler other than MinGW/Cygwin, you would build the wxWidgets library from the @c "build/msw" directory which contains the relevant makefiles. -On Windows using MinGW/Cygwin, and on Unix, MacOS X and OS/2, you invoke +On Windows using MinGW/Cygwin, and on Unix, OS X and OS/2, you invoke 'configure' (found in the top-level of the wxWidgets source hierarchy), from within a suitable empty directory for containing makefiles, object files and libraries. diff --git a/docs/doxygen/mainpages/introduction.h b/docs/doxygen/mainpages/introduction.h index bbff75f6aa..c08cb581e9 100644 --- a/docs/doxygen/mainpages/introduction.h +++ b/docs/doxygen/mainpages/introduction.h @@ -15,207 +15,118 @@ @section page_introduction_whatis What is wxWidgets? -wxWidgets is a C++ framework providing GUI (Graphical User -Interface) and other facilities on more than one platform. Version 2 and higher -currently support all desktop versions of MS Windows, Unix with GTK+ 1.x or 2.x, -Unix with Motif, Unix with just X11, Unix with DirectFB, Mac OS X, OS/2. +wxWidgets is an open source C++ framework allowing to write cross-platform +GUI applications with native look and feel in C++ and other languages. -wxWidgets was originally developed at the Artificial Intelligence -Applications Institute, University of Edinburgh, for internal use, -and was first made publicly available in 1992. -Version 2 is a vastly improved version written and maintained by -Julian Smart, Robert Roebling, Vadim Zeitlin, Vaclav Slavik and many others. +wxWidgets was originally developed by Julian Smart at the Artificial +Intelligence Applications Institute, University of Edinburgh, for internal use, +and was first made publicly available in 1992, with a vastly improved version 2 +released in 1999. The last major version of the library is 3 and was released +in 2013. Currently wxWidgets is developed and maintained by Julian Smart, Vadim +Zeitlin, Stefan Csomor, Robert Roebling, Vaclav Slavik and many others. -This manual contains a class reference and topic overviews. -For a selection of wxWidgets tutorials, please see the documentation page -on the wxWidgets web site: http://www.wxwidgets.org. - -Please note that in the following, "MS Windows" often refers to all -platforms related to Microsoft Windows, including 32-bit and 64-bit -variants, unless otherwise stated. All trademarks are acknowledged. +More information about wxWidgets is available on its web site at +http://www.wxwidgets.org. -@section page_introduction_why Why another cross-platform development tool? +@section page_introduction_why Why choose wxWidgets? -wxWidgets was developed to provide a cheap and flexible way to maximize -investment in GUI application development. While a number of commercial -class libraries already existed for cross-platform development, -none met all of the following criteria: +Compared to the other similar libraries, wxWidgets is: -@li low price; -@li source availability; -@li simplicity of programming; -@li support for a wide range of compilers. +1. The only C++ GUI library built by wrapping native GUI widgets which results + in the best user experience on each platform. +2. Written using only the standard C++ and doesn't rely on any custom + extensions or preprocessing. +3. Open source and free for use in both open source and commercial projects. -Since wxWidgets was started, several other free or almost-free -GUI frameworks have emerged. However, none has the range of -features, flexibility, documentation and the well-established -development team that wxWidgets has. -As open source software, wxWidgets has benefited from comments, -ideas, bug fixes, enhancements and the sheer enthusiasm of -users. This gives wxWidgets a certain advantage over its -commercial competitors (and over free libraries without an -independent development team), plus a robustness against the -transience of one individual or company. This openness and -availability of source code is especially important when the -future of thousands of lines of application code may depend upon -the longevity of the underlying class library. +wxWidgets provides a simple, easy to learn, yet very rich API. It is also +mature and stable, and the applications written using wxWidgets 2.0 +pre-releases almost 20 years ago can still be built today with wxWidgets 3 +almost unchanged. wxWidgets has a large, active and friendly community of +people, including both the users and developers of the library. It is also +available now for more than a dozen other languages, including Python, Perl, +Ruby, Lua, Haskell, D, Erlang, PHP, in addition to C++. -Version 2 goes much further than previous versions in terms of -generality and features, allowing applications to be produced -that are often indistinguishable from those produced using -single-platform toolkits such as Motif, GTK+ and MFC. +It is impossible to sum up everything included in wxWidgets in a few +paragraphs, but here are some of the benefits: -The importance of using a platform-independent class library -cannot be overstated, since GUI application development is very -time-consuming, and sustained popularity of particular GUIs -cannot be guaranteed. Code can very quickly become obsolete if -it addresses the wrong platform or audience. wxWidgets helps to -insulate the programmer from these winds of change. Although -wxWidgets may not be suitable for every application (such as an -OLE-intensive program), it provides access to most of the -functionality a GUI program normally requires, plus many extras -such as network programming, PostScript output, and HTML -rendering; and it can of course be extended as needs dictate. -As a bonus, it provides a far cleaner and easier programming -interface than the native APIs. Programmers may find it -worthwhile to use wxWidgets even if they are developing on only -one platform. - -It is impossible to sum up the functionality of wxWidgets in a few paragraphs, but -here are some of the benefits: - -@li Low cost (free, in fact!) -@li You get the source. -@li Available on a variety of popular platforms. -@li Works with almost all popular C++ compilers and Python. -@li Over 70 example programs. -@li Over 1000 pages of printable and on-line documentation. -@li Simple-to-use, object-oriented API. +@li Available on all major desktop platforms. +@li Free for any use. +@li Source is available and easy to read and modify if necessary. +@li Over 100 example programs. +@li Extensive documentation (almost 200,000 lines of it). +@li Straightforward API. +@li Simple but powerful layout system. +@li Run-time loadable or compile-time embeddable resources. @li Flexible event system. -@li Graphics calls include lines, rounded rectangles, splines, polylines, etc. -@li Constraint-based and sizer-based layouts. -@li Print/preview and document/view architectures. -@li Toolbar, notebook, tree control, advanced list control classes. -@li PostScript generation under Unix, normal MS Windows printing on the PC. -@li MDI (Multiple Document Interface) support. -@li Can be used to create DLLs under Windows, dynamic libraries on Unix. -@li Common dialogs for file browsing, printing, colour selection, etc. -@li Under MS Windows, support for creating metafiles and copying them to the clipboard. -@li An API for invoking help from applications. -@li Ready-to-use HTML window (supporting a subset of HTML). -@li Network support via a family of socket and protocol classes. -@li Support for platform independent image processing. -@li Built-in support for many file formats (BMP, PNG, JPEG, GIF, XPM, PNM, PCX). +@li All the usual and quite a few of more rare GUI controls. +@li And also all the standard dialogs. +@li 2D path-based drawing API with full support for transparency. +@li Built-in support for many file formats (BMP, PNG, JPEG, GIF, XPM, PNM, PCX, TGA, ...). +@li Printing, help, clipboard, drag-and-drop, document/view, ... support. +@li Integration with the native platform HTML rendering engine. +@li Dockable windows framework. +@li Word processor-like widget. +@li Powerful text editing widget with syntax highlighting. +@li And much, much more... @section page_introduction_requirements wxWidgets Requirements -To make use of wxWidgets, you currently need one of the following setups. +wxWidgets first-tier "ports", ie implementations of wxWidgets API, are: -(a) MS-Windows: +@li wxMSW: This is the native port for Microsoft Windows systems (from Windows +95 up to Windows 8.1 with at least Windows XP being recommended), either 32 or +64 bits. The primarily supported compilers are Microsoft Visual C++ (versions 6 +up to 2013 are supported, at least 2005 is recommended) and GNU g++ (either +from the traditional MinGW, TDM-GCC or MinGW-w64 distributions). -@li A 32-bit or 64-bit PC running MS Windows. -@li A Windows compiler: MS Visual C++ (embedded Visual C++ for wxWinCE - port), Borland C++, Watcom C++, Cygwin, MinGW, Digital Mars C++. - See @c install.txt for details about compiler version supported. +@li wxGTK: wxGTK2 and wxGTK3 are the ports using GTK+ library version 2.x and +3.x respectively. They are very similar, with wxGTK2 being, however, more +mature. Both ports work on almost any Unix system (Linux, FreeBSD, OpenBSD, +NetBSD, Solaris, AIX, ...) and require GTK+ 2.6 or later or GTK+ 3.x. The +primary supported compiler is GNU g++. -(b) Unix: +@li wxOSX: wxOSX/Cocoa is the primary port for Apple computers, replacing the +older and now deprecated wxOSX/Carbon port. wxOSX supports either PowerPC or +Intel Macs running OS X 10.5 or higher and can be compiled in either 32 or 64 +bits using Apple Developer Tools (both GNU g++ and clang are supported). -@li Almost any C++ compiler, including GNU C++ and many Unix vendors - compilers such as Sun CC, HP-UX aCC or SGI mipsPro. -@li Almost any Unix workstation, and one of: GTK+ 2.6 or higher (GTK+ 1.2.10 - may still be supported but wxGTK1 port is not maintained any longer and lacks - many features of wxGTK2, Motif 1.2 or higher or Lesstif. If using the wxX11 - port, no such widget set is required. - -(c) Mac OS/Mac OS X: - -@li A PowerPC or Intel Mac running Mac OS X 10.4 or higher -@li The Apple Developer Tools (eg. GNU C++) +Other platforms (iOS, Windows CE, OS/2), compilers (Borland C++ under Windows, +Sun CC, HP-UX aCC, IBM xlC or SGI mipsPro under Unix) and ports (wxOSX/Carbon, +wxGTK1, wxX11, wxDFB, wxPM...) are also supported but to a lesser extent. +Please see the @subpage page_port "platform details page" for more information. +There are no CPU speed requirements but the faster (and more) CPU(s) you have, +the faster the library will compile. You do need to have enough RAM, especially +under Windows platforms, to avoid running out of memory during link phase. +Depending on the compiler used, you may need at least 4GB to be able to link. Under all platforms it's recommended to have large amounts of free hard disk space. The exact amount needed depends on the port, compiler and build -configurations but to give an example, a debug build of the library may take up -to 500MB. +configurations but at least 1GB and possibly more is required. -@section page_introduction_where Availability and location of wxWidgets +@section page_introduction_where Where to get wxWidgets and support for it -wxWidgets is available by anonymous FTP and World Wide Web -from ftp://biolpc22.york.ac.uk/pub and/or http://www.wxwidgets.org. +The download links can be found at http://www.wxwidgets.org. The primary +download location is https://sourceforge.net/downloads/wxwindows/ and there is +also an FTP mirror at ftp://ftp.wxwidgets.org/pub/. Additionally, the latest +version can always be retrieved from our version control system using either +Subversion (http://svn.wxwidgets.org/svn/wx/wxWidgets/) or Git +(https://github.com/wxWidgets/wxWidgets). -You can also buy a CD-ROM using the form on the Web site. +wxWidgets documentation that you are reading is also available online at +http://docs.wxwidgets.org/trunk/ and please also visit our wiki at +http://wiki.wxwidgets.org/ for user-contributed contents. +And if you have any questions, you can join wxWidgets community using - -@section page_introduction_acknowledgements Acknowledgements - -The following is the list of the core, active developers of wxWidgets which keep -it running and have provided an invaluable, extensive and high-quality amount of -changes over the many of years of wxWidgets' life: - -@li Julian Smart -@li Vadim Zeitlin -@li Robert Roebling -@li Robin Dunn -@li Stefan Csomor -@li Vaclav Slavik -@li Paul Cornett -@li Wlodzimierz `ABX' Skiba -@li Chris Elliott -@li David Elliott -@li Kevin Hock -@li Stefan Neis -@li Michael Wetherell - -We would particularly like to thank the following peoples for their contributions -to wxWidgets, and the many others who have been involved in the project over the years. -Apologies for any unintentional omissions from this alphabetic list: - -Yiorgos Adamopoulos, Jamshid Afshar, Alejandro Aguilar-Sierra, AIAI, -Patrick Albert, Karsten Ballueder, Mattia Barbon, Michael Bedward, -Kai Bendorf, Yura Bidus, Keith Gary Boyce, Chris Breeze, Pete Britton, -Ian Brown, C. Buckley, Marco Cavallini, Dmitri Chubraev, Robin Corbet, Cecil Coupe, -Andrew Davison, Gilles Depeyrot, Neil Dudman, Hermann Dunkel, Jos van Eijndhoven, -Tom Felici, Thomas Fettig, Matthew Flatt, Pasquale Foggia, Josep Fortiana, Todd Fries, -Dominic Gallagher, Guillermo Rodriguez Garcia, Wolfram Gloger, Norbert Grotz, -Stefan Gunter, Bill Hale, Patrick Halke, Stefan Hammes, Guillaume Helle, -Harco de Hilster, Cord Hockemeyer, Markus Holzem, Olaf Klein, Leif Jensen, -Bart Jourquin, Guilhem Lavaux, Ron Lee, Jan Lessner, Nicholas Liebmann, -Torsten Liermann, Per Lindqvist, Francesco Montorsi, Thomas Runge, Tatu Männistö, -Scott Maxwell, Thomas Myers, Oliver Niedung, Ryan Norton, Hernan Otero, -Ian Perrigo, Timothy Peters, Giordano Pezzoli, Harri Pasanen, Thomaso Paoletti, -Garrett Potts, Marcel Rasche, Dino Scaringella, Jobst Schmalenbach, Arthur Seaton, -Paul Shirley, Stein Somers, Petr Smilauer, Neil Smith, Kari Systä, George Tasker, -Arthur Tetzlaff-Deas, Jonathan Tonberg, Jyrki Tuomi, Janos Vegh, Andrea Venturoli, -David Webster, Otto Wyss, Xiaokun Zhu, Edward Zimmermann. - -Many thanks also to AIAI for being willing to release the original version of -wxWidgets into the public domain, and to our patient partners. - -`Graphplace', the basis for the wxGraphLayout library, is copyright Dr. Jos -T.J. van Eijndhoven of Eindhoven University of Technology. The code has -been used in wxGraphLayout (not in wxWidgets anymore) with his permission. - -We also acknowledge the author of XFIG, the excellent Unix drawing tool, -from the source of which we have borrowed some spline drawing code. -His copyright is included below. - - -XFig2.1 is copyright (c) 1985 by Supoj Sutanthavibul. Permission to -use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided -that the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of M.I.T. not be used in advertising or -publicity pertaining to distribution of the software without specific, -written prior permission. M.I.T. makes no representations about the -suitability of this software for any purpose. It is provided ``as is'' -without express or implied warranty. - +- Web-based wxForum. +- Mailing lists. +- @c #wxwidgets IRC channel. +- Or asking questions with @c wxwidgets tag on http://stackoverflow.com/ */ diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h index bdb4d8376b..21fc4c1f23 100644 --- a/docs/doxygen/mainpages/manual.h +++ b/docs/doxygen/mainpages/manual.h @@ -9,30 +9,49 @@ @mainpage Documentation -@author Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn, - Stefan Csomor, Francesco Montorsi, Bryan Petty, et al - -@date October, 2013 - @image html main_wxlogo.png +@author Julian Smart, Vadim Zeitlin, Robin Dunn, Stefan Csomor, + Bryan Petty, Francesco Montorsi, Robert Roebling et al + +@date November 11, 2013 + +@n + +Welcome to wxWidgets, a stable and powerful open source framework for +developing native cross-platform GUI applications in C++! + +@n + +If you are new to wxWidgets, please start with the @subpage page_introduction +"introduction" and follow with the @subpage page_topics "programming guides", +with maybe a look at @subpage page_samples "the samples" as you go. If you are +already familiar with wxWidgets, please read about @subpage +overview_changes_since28 "the changes" in the latest version compared to 2.8 +series. And you can also follow the links in the reference section or jump +directly to the alphabetical list of classes +to find out more about the topic you are interested in. + @section manual_user User Manual @li @subpage page_introduction -@li @subpage page_copyright -@li @subpage page_utils -@li @subpage page_samples +@li @subpage page_topics @li @subpage page_libs @li @subpage page_class_cat -@li @subpage page_topics -@li @subpage page_multiplatform -@li @subpage page_port +@li @subpage overview_changes_since28 -@section manual_reference Reference Manual +@section manual_reference Reference -@li @subpage page_constants -@li @subpage page_translations @li @subpage group_class @li @subpage group_funcmacro +@li @subpage page_constants + +@section manual_misc Other Information + +@li @subpage page_samples +@li @subpage page_utils +@li @subpage page_translations +@li @subpage page_multiplatform +@li @subpage page_copyright */ diff --git a/docs/doxygen/mainpages/platdetails.h b/docs/doxygen/mainpages/platdetails.h index 022de6b397..8ee92c7ba2 100644 --- a/docs/doxygen/mainpages/platdetails.h +++ b/docs/doxygen/mainpages/platdetails.h @@ -62,7 +62,7 @@ distribution. @subsection page_port_wxosx_carbon wxOSX/Carbon wxOSX/Carbon is a port of wxWidgets for the Macintosh OS platform. Currently -MacOS X 10.5 or higher are supported. wxOSX/Carbon can be compiled both using +OS X 10.5 or higher are supported. wxOSX/Carbon can be compiled both using Apple's command line developer tools as well as Apple's Xcode IDE. wxOSX/Carbon supports both the Intel and PowerPC architectures and can be used to produce "universal binaries" in order create application which can run both @@ -81,7 +81,7 @@ distribution. @subsection page_port_wxosx_cocoa wxOSX/Cocoa wxOSX/Cocoa is another port of wxWidgets for the Macintosh OS platform. -Currently MacOS X 10.5 or higher are supported. In contrast to wxOSX/Carbon, +Currently OS X 10.5 or higher are supported. In contrast to wxOSX/Carbon, it uses the Cocoa API in place of Carbon. Much work has gone into this port and many controls are functional, but the port has not reached the maturity of the wxOSX/Carbon port yet. It is possible to use wxOSX/Cocoa on 64-bit diff --git a/docs/doxygen/mainpages/topics.h b/docs/doxygen/mainpages/topics.h index 57d5fe3227..969371b064 100644 --- a/docs/doxygen/mainpages/topics.h +++ b/docs/doxygen/mainpages/topics.h @@ -7,7 +7,7 @@ /** -@page page_topics Topic Overviews +@page page_topics Programming Guides @tableofcontents @@ -22,7 +22,6 @@ topics related to building applications with wxWidgets. @li @subpage overview_roughguide @li @subpage overview_helloworld @li @subpage overview_python -@li @subpage overview_changes_since28 @section page_topics_programming Important wxWidgets Topics diff --git a/docs/doxygen/mainpages/translations.h b/docs/doxygen/mainpages/translations.h index f52b51ece7..d9465cf01c 100644 --- a/docs/doxygen/mainpages/translations.h +++ b/docs/doxygen/mainpages/translations.h @@ -8,7 +8,7 @@ /** -@page page_translations Translations +@page page_translations Translations to Other Languages @tableofcontents @@ -49,52 +49,78 @@ to foil spam robots, remove one \@ from them. Afrikaans - 71% - Petri Jooste + 68% + + Petri Jooste + Albanian - 79% - Besnik Bleta + 75% + + Besnik Bleta + + + + + Arabic + 45% + + Abdullah Abouzekry + Basque - 18% - 3ARRANO Euskalgintza Taldea + 100% + + 3ARRANO Euskalgintza Taldea, + Xabier Aramendi + Catalan - 67% - Pau Bosch i Crespo + 65% + + Pau Bosch i Crespo, + Robert Millan + Chinese (simplified) - 80% - mrfx + 100% + + mrfx, + Liu XiaoXi, + Huang Jiawei, + William Jiang + Chinese (traditional) - 80% - pal.tw + 100% + + pal.tw + Czech - 68% + 100% Vaclav Slavik, - Herbert Breunung + Herbert Breunung, + ZbynÄ›k Schwarz Danish - 78% + 74% Leif Jensen, Henrik Ræder Clausen, @@ -104,8 +130,12 @@ to foil spam robots, remove one \@ from them. Dutch - 92% - Patrick Hubers + 100% + + Patrick Hubers, + Gideon van Melle, + Thomas De Rocker + @@ -116,18 +146,19 @@ to foil spam robots, remove one \@ from them. Finnish - 88% + 91% Kaj G Backas, Lauri Nurmi, Jaakko Salli, - Elias Julkunen + Elias Julkunen, + Jani Kinnunen French (standard) - 95% + 96% Stephane Junique, Lionel Allorge, @@ -137,7 +168,7 @@ to foil spam robots, remove one \@ from them. Galician - 80% + 76% Leandro Regueiro, Adrián González Alba @@ -146,7 +177,7 @@ to foil spam robots, remove one \@ from them. German - 81% + 100% Daniel Reith, Gerhard Gruber, @@ -155,13 +186,15 @@ to foil spam robots, remove one \@ from them. Mark Johnson, Martin Jost, Herbert Breunung, - Ch. Buck + Ch. Buck, + Max Christian Pohle, + Thomas Krebs Greek - 76% + 73% Tsolakos Stavros, Nassos Yiannopoulos @@ -170,7 +203,7 @@ to foil spam robots, remove one \@ from them. Hindi - 92% + 83% Dhananjaya Sharma, Priyank Bolia @@ -179,7 +212,7 @@ to foil spam robots, remove one \@ from them. Hungarian - 80% + 76% Végh János Dr. @@ -187,51 +220,78 @@ to foil spam robots, remove one \@ from them. Indonesian - 73% + 100% - Bambang Purnomosidi D. P. + Bambang Purnomosidi D. P., + Rahmat Bambang Italian - 91% + 100% Mattia Barbon, - Marco Cavallini - (Koan Software) + Marco Cavallini, + (Koan Software), + Stefano Japanese - 81% + 97% James Bishop, Hiroshi Saito, - Suzumizaki-Kimitaka + Suzumizaki-Kimitaka, + Y. KABA. + + + + + Korean + 85% + + Sungkee Jung Latvian - 21% + 90% Lauris Bukshis + + Lithuanian + 15% + + Pieter + + + Malay - 95% + 89% Mahrazi Mohd Kamal + + Nepali + 100% + + Him Prasad Gautam + + + Norwegian Bokmal - 78% + 74% Hans F. Nordhaug @@ -239,17 +299,19 @@ to foil spam robots, remove one \@ from them. Polish - 81% + 94% Piotr Mackowiak, Janusz Piwowarski, - ABX + ABX, + MichaÅ‚ Trzebiatowski, + Grzegorz Zlotowicz Portuguese (pt) - 95% + 89% Bernardo Santos Wernesback, Mario Pereira, @@ -264,13 +326,25 @@ to foil spam robots, remove one \@ from them. E.A. Tacao, José Eduardo de Carvalho Diniz, - Adiel Mittmann + Adiel Mittmann, + Allann Jones, + Felipe + + + + + Romanian + 100% + + Cătălin Răceanu, + Adrian Hăisan, + Manuel Ciosici Russian - 78% + 74% Dennis Prochko, Roman Rolinsky, @@ -281,13 +355,15 @@ to foil spam robots, remove one \@ from them. Slovak - 77% - Ivan Masar + 74% + + Ivan Masar + Slovenian - 100% + 97% Roman Plevel, Martin Srebotnjak @@ -296,7 +372,7 @@ to foil spam robots, remove one \@ from them. Spanish - 95% + 89% Guillermo Rodriguez Garcia, JSJ, @@ -307,22 +383,33 @@ to foil spam robots, remove one \@ from them. Swedish - 95% + 98% Jonas Rydberg, Kaj G Backas + + Tamil + 100% + + DINAKAR T.D. + + + Turkish - 92% - Hakki Dogusan + 100% + + Hakki Dogusan, + Kaya Zeren + Ukrainian - 95% + 100% Eugene Manko, Yuri Chornoivan, @@ -332,14 +419,18 @@ to foil spam robots, remove one \@ from them. Valencian (ca\@valencia) - 67% - Robert Millan + 65% + + Robert Millan + Vietnamese 100% - Tran Ngoc Quan + + Tran Ngoc Quan + diff --git a/docs/doxygen/overviews/changes_since28.h b/docs/doxygen/overviews/changes_since28.h index 4a0320db19..72fadf3df7 100644 --- a/docs/doxygen/overviews/changes_since28.h +++ b/docs/doxygen/overviews/changes_since28.h @@ -11,7 +11,12 @@ @page overview_changes_since28 Changes Since wxWidgets 2.8 This topic describes backwards-incompatible changes in wxWidgets 3.0 compared -to the last stable release. +to the last stable release and is very important to read if you are updating +from the 2.8 or an older version. And even if you hadn't used any previous +version of wxWidgets and are starting directly with 3.0, it can still be useful +to have at least a quick look at it just to know that some of the older +examples and tutorials may not be applicable any more to wxWidgets 3.0. + The incompatible changes can be grouped into the following categories: diff --git a/docs/doxygen/overviews/xrc.h b/docs/doxygen/overviews/xrc.h index c1d7c07fdb..82502dac57 100644 --- a/docs/doxygen/overviews/xrc.h +++ b/docs/doxygen/overviews/xrc.h @@ -464,7 +464,7 @@ IMPLEMENT_DYNAMIC_CLASS(MyControlXmlHandler, wxXmlResourceHandler) MyControlXmlHandler::MyControlXmlHandler() { - // this call adds support for all wxWindows class styles + // this call adds support for all wxWidgets class styles // (e.g. wxBORDER_SIMPLE, wxBORDER_SUNKEN, wxWS_EX_* etc etc) AddWindowStyles(); diff --git a/docs/doxygen/regen.bat b/docs/doxygen/regen.bat index 57550b5242..c73a04c9d1 100644 --- a/docs/doxygen/regen.bat +++ b/docs/doxygen/regen.bat @@ -66,6 +66,23 @@ IF "%1" == "all" ( ) ) +REM Check for Graphviz (its location should be in %PATH%). +REM +REM NB: Always do this check because it looks like errorlevel is not set +REM when the test is done inside the IF block. +dot NUL 2>&1 +IF %GENERATE_HTML%==YES ( + IF NOT %errorlevel%==0 ( + IF %errorlevel%==9009 ( + echo Error: dot was not found in PATH, please install Graphviz! + ) ELSE ( + echo Error: %errorlevel% error code when running dot, please check Graphviz installation. + ) + + EXIT /B + ) +) + REM REM NOW RUN DOXYGEN REM @@ -75,3 +92,14 @@ REM not included! REM set PATH=%PATH%;%HHC_PATH% doxygen Doxyfile + +REM Check that class inheritance diagram images are present for html/chm docs. +REM +REM NB: Set the file to check outside the IF block, +REM otherwise the second check does not always pick its value. +set filetofind=out\html\classwx_app_console__inherit__graph.png +IF %GENERATE_HTML%==YES ( + IF NOT EXIST %~dp0%filetofind% ( + echo Warning: Class inheritance diagram images are missing, please check Graphviz installation. + ) +) diff --git a/docs/gtk/wxGNOME/wxGNOME.html b/docs/gtk/wxGNOME/wxGNOME.html index bb230bf4a3..2b9df2577a 100644 --- a/docs/gtk/wxGNOME/wxGNOME.html +++ b/docs/gtk/wxGNOME/wxGNOME.html @@ -22,7 +22,7 @@ and another one, which only uses X11 calls and which draws its widgets entirely itself, without using any outside library. This port is called wxX11 or sometimes more generally wxUniv (short for wxUniversal), since this widget set (implemented entirely within -wxWidgets) is available whereever wxWidgets is available. Since this +wxWidgets) is available wherever wxWidgets is available. Since this short overview is mainly about how to write wxWidgets applications for the GNOME[3] desktop, I will focus on the GTK+ port, which is generally referred @@ -43,11 +43,11 @@ most aspects of GUI and non-GUI application programming. Sometimes, various aspects of these design goals contradict each other and this holds true especially for the Linux platform which – from the point of view of the desktop environment integration – is -lagging behind the other two major desktops (Windows and MacOS X) +lagging behind the other two major desktops (Windows and OS X) mostly because of the schism between the GTK+ based GNOME desktop and the Qt[5] based KDE[6] desktop. So far, -the typical wxWidgets user targeted Windows, maybe MacOS X and Linux +the typical wxWidgets user targeted Windows, maybe OS X and Linux in general, so the aim was to make wxGTK applications run as well as possible on as many versions of Linux as possible, including those using the KDE environment. Luckily, most of these distributions diff --git a/docs/msw/install.txt b/docs/msw/install.txt index b216291e25..6d24e72035 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -1,27 +1,9 @@ -Installing wxWidgets for Windows ------------------------------------------------------------ + Installing wxWidgets for Windows + -------------------------------- This is wxWidgets for Microsoft Windows 9x/ME, Windows NT -and later (2000, XP, Vista, 7, etc) and Windows CE. - -These installation notes can be found in docs/msw/install.txt -in your wxWidgets distribution. - -IMPORTANT NOTE: If you experience problems installing, please -re-read these instructions and other related files (changes.txt, -readme.txt, FAQ) carefully before posting to wx-users list. - -If you are sure that you found a bug, please report it at -wxWidgets Trac: - - http://trac.wxwidgets.org/newticket - -Please notice that often trying to correct the bug yourself is the -quickest way to fix it. Even if you fail to do it, you may -discover valuable information allowing us to fix it while doing -it. We also give much higher priority to bug reports with patches -fixing the problems so this ensures that your report will be -addressed sooner. +and later (2000, XP, Vista, 7, 8, etc) including both 32 bit and 64 +bit versions. Table of Contents: @@ -34,27 +16,37 @@ Table of Contents: Installation ============ -Please simply uncompress the .zip file manually into any directory. -However we advise avoiding using directories with spaces in their -names (notably "C:\Program Files") as this risks creating problems +If you are using one of the supported compilers, you can download the +pre-built in binaries from + + https://sourceforge.net/projects/wxwindows/files/3.0.0/binaries/ + +or + + ftp://ftp.wxwidgets.org/pub/3.0.0/binaries/ + +In this case, just uncompress the binaries archive under any directory +and skip to "Building Applications Using wxWidgets" part. + +Otherwise, or if you want to build a configuration of the library +different from the default one, you need to build the library from +sources before using it. + +The first step, which you may have already performed, unless you are +reading this file online, is to download the source archive and +uncompress it in any directory. It is strongly advised to avoid using +spaces in the name of this directory, i.e. notably do *not* choose a +location under "C:\Program Files", as this risks creating problems with makefiles and other command-line tools. - -In the majority of cases, you don't need to change the default -library build configuration. If you wish to change some of the build -options you need to edit the include/wx/msw/setup.h file enabling or -disabling the features you would like to compile wxWidgets with[out]. +After choosing the directory location, please define WXWIN environment +variable containing the full path to this directory. While this is not +actually required, this makes using the library more convenient and +this environment variable is used in the examples below. NB: If you checked your sources from version control repository and - didn't obtain them from a release file, the file above doesn't - exist and you will need to copy include/wx/msw/setup0.h to - include/wx/msw/setup.h. - -Notice that this file is later copied into a directory under lib for -each of the build configurations which allows to have different -build options for different configurations too. - -See "Configuring the Build" section for more information. + didn't obtain them from a release file, you also need to copy + include/wx/msw/setup0.h to include/wx/msw/setup.h. Building wxWidgets @@ -64,224 +56,168 @@ The following sections explain how to compile wxWidgets with each supported compiler, see the "Building Applications" section about the instructions for building your application using wxWidgets. -Search for one of Microsoft/Borland/Watcom/Symantec/Cygwin/Mingw32 keywords -to quickly locate the instructions for your compiler. Notice that the primary -compilers for wxWidgets under MSW are Microsoft Visual C++ and GNU g++, other -compilers are more rarely tested and might not work so please consider using -one of these two if possible. - All makefiles and project are located in build\msw directory. -Where Compiled Files are Stored -------------------------------- - -After successful compilation you'll find the libraries in a subdirectory -of lib directory named after the compiler and DLL/static settings. -A couple of examples: - - lib\vc_lib VC++ compiled static libraries - lib\vc_dll VC++ DLLs - lib\bcc_lib Static libraries for Borland C++ - lib\wat_dll Watcom C++ DLLs - -Names of compiled wxWidgets libraries follow this scheme: libraries that don't -depend on GUI components begin with "wxbase" followed by a version number and, -optionally, letters indicating Unicode compilation ('u') and a debug build ('d'). -The last component is the name of the wxWidgets component (unless you build the -library as single monolithic library; look for "Configuring the Build" below). -This is a typical set of release ANSI build libraries (release versions on -left, debug on right side): - - wxbase29.lib wxbase29d.lib - wxbase29_net.lib wxbase29d_net.lib - wxbase29_xml.lib wxbase29d_xml.lib - wxmsw29_core.lib wxmsw29d_core.lib - wxmsw29_html.lib wxmsw29d_html.lib - wxmsw29_adv.lib wxmsw29d_adv.lib - -Their Unicode debug counterparts in wxUniversal build would be - - wxbase29ud.lib - wxbase29ud_net.lib - wxbase29ud_xml.lib (notice these libs are same for wxUniv and wxMSW) - wxmswuniv29ud_core.lib - wxmswuniv29ud_html.lib - wxmswuniv29ud_adv.lib - -These directories also contain a subdirectory with the wx/setup.h header. This -subdirectory is named after the port, Unicode, wxUniv and debug settings and -you must add it to the include paths when compiling your application. Some -examples: - - lib\vc_lib\msw\wx\setup.h VC++ static, wxMSW - lib\vc_lib\mswud\wx\setup.h VC++ static, wxMSW, Unicode, debug - lib\vc_lib\mswunivd\wx\setup.h VC++ static, wxUniversal, debug - -Below are compiler specific notes followed by customizing instructions that -apply to all compilers (search for "Configuring the Build"). - Microsoft Visual C++ Compilation ---------------------------------------------------------------- -You may wish to visit http://wiki.wxwidgets.org/Microsoft_Visual_C%2B%2B_Guide -for a more informal and detailed description of the process summarized below. +* From command line using the provided makefiles: -Please note that currently ready to use projeect files are provided for VC++ -versions 6 through to 9 (also known as 6, 2003, 2005 and 2008). For VC++ 10 and -11 (2010 and 2012, respectively), you will need to import the existing VC9 -project files. +0. Open a "Visual Studio Command Prompt" window shortcut to which + must have been installed to the "Start" menu or the "Start" screen + by MSVS installation. -Using project files (VC++ 6 and later): +1. Change directory to %WXWIN%\build\msw and type -1. Unarchive wxWidgets-x.y.z-vc.zip, the VC++ 6 project - makefiles (already included in wxMSW-x.y.z.zip and the setup version). -2. Open build\msw\wx.dsw, which has configurations for static - compilation or DLL compilation, and each of these available in - Unicode/ANSI, Debug/Release and wxUniversal or native variations. - Choose the Win32 Debug or Win32 Release configuration (or any other that - suits your needs) and use Batch Build to compile _all_ projects. If you - know you won't need some of the libraries (e.g. the HTML part), you don't have - to compile it. It will also produce similar variations on jpeg.lib, - png.lib, tiff.lib, zlib.lib, and regex.lib. + > nmake /f makefile.vc - If you want to build DLL configurations in wx.dsw project you unfortunately - need to build them in the proper order (jpeg, png, tiff, zlib, regex, expat, - base, net, core, gl, html, media, qa, adv, xrc, aui, richtext, - propgrid) manually because VC6 doesn't always respect the correct build order. + to build wxWidgets in the default debug configuration as a static + library. You can also do - Alternatively, use the special wx_dll.dsw project which adds the - dependencies to force the correct order (but, because of this, doesn't work - for the static libraries) or simply redo the build several times until all - DLLs are linked correctly. -3. Open a sample project file, choose a configuration such as - Win32 Debug using Build | Set Active Configuration..., and compile. - The project files don't use precompiled headers, to save disk - space, but you can switch PCH compiling on for greater speed. - NOTE: you may also use samples/samples.dsw to access all - sample projects without opening each workspace individually. - You can use the Batch Build facility to make several samples - at a time. + > nmake /f makefile.vc BUILD=release -Using makefiles: + to build a release version or -1. Change directory to build\msw. Type: + > nmake /f makefile.vc BUILD=release SHARED=1 - 'nmake -f makefile.vc' + to build a release DLL version. Finally, you can also add + "TARGET_CPU=X64" to nmake command line to build Win64 versions + (this only works if you are using a 64 bit compiler, of course). - to make the wxWidgets core library as release DLL. - See "Configuring the Build" for instruction how to build debug or static - libraries. + See "Configuring the Build" for more information about the + additional parameters that can be specified on the command line. -2. Change directory to samples and type 'nmake -f makefile.vc' - to make all the samples. You can also make them individually. +2. To verify your build, change the directory to samples\minimal and + run the same nmake command (with the same parameters there), this + should create a working minimal wxWidgets sample. -Makefile notes: +3. If you need to rebuild, use "clean" target first or "nmake /a". - Use the 'clean' target to clean all objects, libraries and - executables. -Note (1): if you wish to use templates, please edit -include\wx\msw\setup.h and set wxUSE_DEBUG_NEW_ALWAYS to 0. -Without this, the redefinition of 'new' will cause problems in -the headers. Alternatively, #undef new before including template headers. -You will also need to set wxUSE_IOSTREAMH to 0 if you will be -using templates, to avoid the non-template stream files being included -within wxWidgets. +* From the IDE using the provided project files: -Note (2): libraries and applications generated with makefiles and -project files are now (hopefully) compatible where static libraries -are concerned, but please exercise caution nevertheless and if -possible, use one method or the other. +Ready to use project files are provided for VC++ versions 6, 7, 8, 9 +and 10 (also known as MSVS 6, 2003, 2005, 2008 and 2010 respectively). +For VC++ 11 (2012, respectively), you need to import the existing VC10 +project files into VC11 IDE first. -Note (3): some crash problems can be due to inconsistent compiler -options. If strange/weird/impossible things start to happen please -check (dumping IDE project file as makefile and doing text comparison -if necessary) that the project settings, especially the list of defined -symbols, struct packing, etc. are exactly the same for all items in -the project. After this, delete everything (including PCH) and recompile. +Simply open wx_vcN.sln (for N=7, 8, 9 or 10) or wx.dsw (for VC6) file, +select the appropriate configuration (Debug or Release, static or DLL) +and build the solution. Notice that when building a DLL configuration, +you may need to perform the build several times because the projects +are not always built in the correct order, and this may result in link +errors. Simply do the build again, up to 3 times, to fix this. -Note (4): to create your own IDE files, copy .dsp and .dsw -files from an existing wxWidgets sample and adapt them, or -visit http://wiki.wxwidgets.org/Microsoft_Visual_C%2B%2B_Guide. +Notice that x64 configurations are only included in VC10 project +currently. If you want to build Win64 libraries with the previous +compiler versions, the simplest solution is to use the makefiles as +described above. -Microsoft Visual C++ Compilation for 64-bit Windows + +Cygwin/MinGW Compilation ---------------------------------------------------------------- -Visual Studio 2005 includes 64-bit compilers, though they are not installed by -default; you need to select them during the installation. Both native 64-bit -compilers and 32-bit hosted cross compilers are included, so you do not need a -64-bit machine to use them (though you do to run the created executables). -Visual C++ Express Edition does not include 64-bit compilers. +wxWidgets supports Cygwin, MinGW, MinGW-w64 and TDM-GCC tool chains under +Windows. They can be downloaded from: -64-bit compilers are also available in various SDKs, for example -the .NET Framework SDK: - http://msdn.microsoft.com/netframework/programming/64bit/devtools/ + http://www.cygwin.com/ + http://www.mingw.org/ + http://mingw-w64.sourceforge.net/ + http://tdm-gcc.tdragon.net/ -Using project files: +respectively. Please retrieve and install the latest version of your preferred +tool chain by following the instructions provided by these packages. Notice +that Cygwin includes both native Cygwin compiler, which produces binaries that +require Cygwin during run-time, and MinGW[-w64] cross-compilers which can still +be used in Cygwin environment themselves but produce plain Windows binaries +without any special run-time requirements. You will probably want to use the +latter for developing your applications. -1. Open the solution file for the version you use: build\msw\wx_vc8.sln or - wx_vc9.sln. +If using MinGW, you can download the add-on MSYS package to provide Unix-like +tools that you'll need to build wxWidgets using configure. -2. To add 64-bit targets, go to the 'Build' menu and choose 'Configuration - Manager...'. In the 'Active solution platform' drop down choose '', - then you can choose either 'Itanium' or 'x64'. +C++11 note: If you want to compile wxWidgets in C++11 mode, you currently have + to use -std=gnu++11 switch as -std=c++11 disables some extensions + that wxWidgets relies on. I.e. please use CXXFLAGS="-std=gnu++11". - For more detailed instructions see: - http://msdn2.microsoft.com/en-us/library/9yb4317s(en-us,vs.80).aspx +All of these tool chains can be used either with Unix-like configure+make build +process (preferred) or with the provided makefile.gcc makefiles without using +configure: - Note: 64-bit targets created this way will use the build directory of the - corresponding 32-bit target for some files. Therefore after building - for one CPU it is necessary to clean the build before building the - equivalent target for another CPU. We've reported the problem to MS - but they say it is not possible to fix it. +* Using configure -3. To build, go to the 'Build' menu and choose 'Batch Build...'. Tick all the - all the 'x64|Debug' or all the 'Itanium|Debug' projects, and click 'Build'. +This method works in exactly the same way as under Unix systems, +including OS X, and requires a Unix-like environment to work, i.e. +either MSYS or Cygwin. - This will build a debug version of the static libs. The section above on - Visual C++ in general has more information about adjusting the settings to - build other configurations. +0. Open MSYS or Cygwin shell prompt. -4. To compile one of the samples open one of the sample projects, such as - samples\minimal\minimal_vc7.vcproj. Visual Studio will convert the project as in - step 1, then add a 64-bit target as in step 2, and build. +1. Create a build directory: it is is strongly recommended to not + build the library in the directory containing the sources ($WXWIN) + but to create a separate build directory instead. The build + directory can be placed anywhere (using the fastest available disk + may be a good idea), but in this example we create it as a + subdirectory of the source one: -Using makefiles: + $ cd $WXWIN + $ mkdir build-debug -1. Open a 64-bit build command prompt, for either x64 or Itanium. Change - directory to build\msw. Then for x64 type: +2. Run configure passing it any of the options shown by "configure + --help". Notice that configure builds shared libraries by default, + use --disable-shared to build static ones. For example: - nmake -f makefile.vc TARGET_CPU=X64 + $ ../configure --enable-debug - or for Itanium: +3. Build the library: - nmake -f makefile.vc TARGET_CPU=IA64 + $ make - This will build a debug version of wxWidgets DLLs. See "Configuring the - build" for instruction how to build other configurations such as a release - build or static libraries. +4. Test the library build by building the minimal sample: -2. Change to the directory of one of the samples such as samples\minimal. Type - the same command used to build the main library, for example for x64: + $ cd samples/minimal + $ make - nmake -f makefile.vc TARGET_CPU=X64 +5. Optionally install the library in a global location -Notes: + $ make install -The versions of the VC++ 8 compiler included with some SDKs requires an -additional library to be linked or the following error is received. + Notice that there is not much benefice to installing under Windows + so this step can usually be omitted. - LNK2001 unresolved external symbol __security_check_cookie -If you receive this error add bufferoverflowu.lib to link, e.g.: +* Using plain makefiles: + +NOTE: The makefile.gcc makefiles are for compilation under MinGW using + Windows command interpreter (command.com/cmd.exe), they won't work + if you use Unix shell, as is the case with MSYS. Follow the instructions + for using configure above instead if you prefer to use Unix shell. + +0. Open DOS command line window (cmd.exe, *not* Bash sh.exe). + +1. Change directory to %WXWIN%\build\msw and type + + > mingw32-make -f makefile.gcc + + to build wxWidgets in the default debug configuration as a static + library. Add "BUILD=release" and/or "SHARED=1" to build the library + in release configuration and/or as a shared library instead of the + default static one. + +2. To verify your build, change the directory to samples\minimal and + run the same mingw32-make command (with the same parameters there), + this should create a working minimal wxWidgets sample. + +3. If you need to rebuild, use "clean" target first. + - nmake -f makefile.vc TARGET_CPU=X64 LDFLAGS=bufferoverflowu.lib -See http://support.microsoft.com/?id=894573 for more information. Borland C++ Compilation ---------------------------------------------------------------- +WARNING: Borland instructions are out of date, please send us your + corrections if you are using it with wxWidgets 3.0. + The minimum version required is 5.5 (last version supported by BC++ 5.0 was 2.4.2), which can be downloaded for free from: http://www.borland.com/products/downloads/download_cbuilder.html @@ -344,180 +280,56 @@ the following preprocessor directive: (check the samples -- e.g., \wx2\samples\minimal\minimal.cpp -- for more details) -Watcom C++ 10.6/11 and OpenWatcom Compilation ----------------------------------------------------------------- - -1. Change directory to build\msw. Type 'wmake -f makefile.wat' to - make the wxWidgets core library. - -2. Change directory to samples\minimal and type 'wmake -f makefile.wat' - to make this sample. Repeat for other samples of interest. - -Note (1): if variant.cpp is compiled with date/time class options, the linker - gives up. So the date/time option is switched off for Watcom C++. - Also, wxAutomationObject is not compiled with Watcom C++ 10. - -Note (2): RawBitmaps won't work at present because they use unsupported template - classes - -Note (3): if Watcom can't read the precompiled header when building a sample, - try deleting .pch files in build\msw\wat_* and compiling - the sample again. - -Note (4): wxUSE_STD_STRING is disabled in wx/string.h for Watcom as this - compiler doesn't come with standard C++ library headers by default. - If you install STLPort or another STL implementation, you'll need to - edit wx/string.h and remove the check for Digital Mars in it (search - for __WATCOM__). - - -Cygwin/MinGW Compilation ----------------------------------------------------------------- - -wxWidgets supports Cygwin, MinGW, MinGW-w64 and TDM-GCC tool chains under -Windows. They can be downloaded from: - - http://www.cygwin.com/ - http://www.mingw.org/ - http://mingw-w64.sourceforge.net/ - http://tdm-gcc.tdragon.net/ - -respectively. Please retrieve and install the latest version of your preferred -tool chain by following the instructions provided by these packages. Notice -that Cygwin includes both native Cygwin compiler, which produces binaries that -require Cygwin during run-time, and MinGW[-w64] cross-compilers which can still -be used in Cygwin environment themselves but produce plain Windows binaries -without any special run-time requirements. You will probably want to use the -latter for developing your applications. - -If using MinGW, you can download the add-on MSYS package to provide Unix-like -tools that you'll need to build wxWidgets using configure. - -C++11 note: If you want to compile wxWidgets in C++11 mode, you currently have - to use -std=gnu++11 switch as -std=c++11 disables some extensions - that wxWidgets relies on. I.e. please use CXXFLAGS="-std=gnu++11". - -All of these tool chains can be used either with Unix-like configure+make build -process (preferred) or with the provided makefile.gcc makefiles without using -configure: - -Using makefiles Directly ----------------------------------------------------------------- - -NOTE: The makefile.gcc makefiles are for compilation under MinGW using - Windows command interpreter (command.com/cmd.exe), they won't work - if you use Unix shell, as is the case with MSYS. Follow the instructions - for using configure below instead in this case. - -Use the makefile.gcc files for compiling wxWidgets and samples, -e.g. to compile a debugging version of wxWidgets: - > cd c:\wx\build\msw - > mingw32-make -f makefile.gcc BUILD=debug - > cd c:\wx\samples\minimal - > mingw32-make -f makefile.gcc BUILD=debug - (See below for more options.) - -Notice that Windows command interpreter (cmd.exe) and mingw32-make must be -used, using Bash (sh.exe) and make.exe from MSYS will only work when using -configure-based build procedure described below! - -You can also use the 'strip' command to reduce executable/dll size (note that -stripping an executable/dll will remove debug information!). - -All targets have 'clean' targets to allow removal of object files -and other intermediate compiler files. - -Using configure ----------------------------------------------------------------- - -Instead of using the makefiles, you can use the configure -system to generate appropriate makefiles, as used on Unix -and Mac OS X systems. - -Change directory to the root of the wxWidgets distribution, -make a build directory, and run configure and make in this directory. - -For example: - - $ cd $WXWIN - $ mkdir build-debug - $ cd build-debug - $ # Optionally use --disable-shared for static linking - $ ../configure --enable-debug - $ make - $ make install # This step is optional - $ cd samples/minimal - $ make - $ ./minimal.exe - - -DigitalMars C++ Compilation ----------------------------------------------------------------- - -Digital Mars compiler is no longer updated as the project is discontinued. -wxWidgets 2.8 was the last version to compile with this compiler. Configuring the Build ================================================================ -So far the instructions only explain how to build release DLLs of wxWidgets -and did not cover any configuration. It is possible to change many aspects of -the build, including debug/release and static/dynamic settings. +NOTE: If you use configure to build the library with Cygwin/MinGW, the + contents of this section does not apply, just pass the arguments + to configure directly in this case. -Notice that in the previous versions of wxWidgets it was possible to build the -library in either ANSI or Unicode mode but in wxWidgets 2.9 and later only a -single, combined, build mode exists. It is still possible to set UNICODE=0 to -disable Unicode support entirely but it is strongly not recommended and should -be never necessary. - - -Changing the Settings +Library configuration ---------------------------------------------------------------- -There are two ways to modify the settings: either by passing the values as -arguments when invoking make or by editing build\msw\config.$(compiler) file -where $(compiler) is same extension as the makefile you use has (see below). -The latter is good for setting options that never change in your development -process (e.g. GCC_VERSION or VENDOR). If you want to build several versions of -wxWidgets and use them side by side, the former method is better. Settings in -config.* files are shared by all makefiles (samples, contrib, main library), -but if you pass the options as arguments, you must use same arguments you used -for the library when building samples or contrib libraries! +While it is never necessary to do it, you may want to change some of +the options in the include/wx/msw/setup.h file before building wxWidgets. +This file is heavily commented, please read it and enable or disable +the features you would like to compile wxWidgets with[out]. -Examples of invoking make in Unicode debug build (other options described -below are set analogically): +Notice that this file is later copied into a directory under lib for +each of the build configurations which allows to have different +build options for different configurations too if you edit any +configuration-specific file. -Visual C++: - > nmake -f makefile.vc BUILD=debug -Borland C++: - > make -f makefile.bcc -DBUILD=debug - (Note that you have to use -D to set the variable, unlike in other make - tools!) - -Watcom C/C++: - > wmake -f makefile.wat BUILD=debug - -MinGW using native makefiles: - > mingw32-make -f makefile.gcc BUILD=debug - -MinGW using configure: - > ./configure --enable-debug - (see ./configure --help on details; configure is not covered in this - section) - -Cygwin using configure: - > ./configure --disable-precomp-headers --enable-debug - (use --disable-precomp-headers if Cygwin doesn't support precompiled - headers) - -Brief explanation of options and possible values is in every -build\msw\config.* file; more detailed description follows. - -Basic Options +Makefile parameters ---------------------------------------------------------------- +When building using makefiles, you can specify many build settings +(unlike when using the project files where you are limited to choosing +just the configuration and platform). This can be done either by +passing the values as arguments when invoking make or by editing +build\msw\config.$(compiler) file where $(compiler) is same extension +as the makefile you use has (see below). The latter is good for +setting options that never change in your development process (e.g. +GCC_VERSION or VENDOR). If you want to build several versions of +wxWidgets and use them side by side, the former method is better. +Settings in config.* files are shared by all makefiles (including the +samples), but if you pass the options as arguments, you must use same +arguments you used for the library when building samples! + +For example, to build the library in release mode you can either +change the "BUILD" variable definition in build\msw\config.$(compiler) +or use + + > nmake -f makefile.vc BUILD=debug + > mingw32-make -f makefile.gcc BUILD=debug + +depending on the compiler used. + +The full list of the build settings follows: + BUILD=release Builds release version of the library. It differs from default 'debug' in lack of appended 'd' in name of library and uses the release CRT libraries @@ -534,16 +346,13 @@ UNICODE=0 systems and can't use MSLU (which requires MSLU=1) for some reason. This option affect name of the library ('u' is appended in the default - Unicode build) and the directory where the library and setup.h are store + Unicode build) and the directory where the library and setup.h are stored (ditto). WXUNIV=1 Build wxUniversal instead of native wxMSW (see http://www.wxwidgets.org/wxuniv.htm for more information). -Advanced Options ----------------------------------------------------------------- - MONOLITHIC=1 Starting with version 2.5.1, wxWidgets has the ability to be built as several smaller libraries instead of single big one as used to be the case @@ -554,22 +363,13 @@ MONOLITHIC=1 USE_GUI=0 Disable building GUI parts of the library, build only wxBase components used by console applications. Note that if you leave USE_GUI=1 then both wxBase - and GUI libraries are built. If you are building monolithic library, then - you should set wxUSE_GUI to 1 in setup.h. + and GUI libraries are built. -USE_OPENGL=1 - Build wxmsw29_gl.lib library with OpenGL integration class wxGLCanvas. - You must also modify your setup.h to #define wxUSE_GLCANVAS 1. Note that - OpenGL library is always built as additional library, even in monolithic - build! - -USE_HTML=0 - Do not build wxHTML library. If MONOLITHIC=1, then you must also - #define wxUSE_HTML 1 in setup.h. - -USE_XRC=0 - Do not build XRC resources library. If MONOLITHIC=1, then you must also - #define wxUSE_HTML 1 in setup.h. +USE_$(LIBRARY)=0 + Do not build the corresponding library (all libraries are built by + default). Library which can be disabled in this way are: AUI, HTML, + MEDIA, GL (the option name is USE_OPENGL for this one), PROPGRID, + QA, RIBBON, RICHTEXT, STC, WEBVIEW, XRC. RUNTIME_LIBS=static Links static version of C and C++ runtime libraries into the executable, so @@ -606,6 +406,16 @@ DEBUG_INFO=1 omitted or set to 'default' its value is determined the value of the BUILD option. +DEBUG_RUNTIME_LIBS=0 +DEBUG_RUNTIME_LIBS=1 + (VC++ only.) If set to 1, msvcrtd.dll is used, if to 0, msvcrt.dll + is used. By default msvcrtd.dll is used only if the executable + contains debug info and msvcrt.dll if it doesn't. It is sometimes + desirable to build with debug info and still link against msvcrt.dll + (e.g. when you want to ship the app to customers and still have + usable .pdb files with debug information) and this setting makes it + possible. + TARGET_CPU=X64|IA64 (VC++ only.) Set this variable to build for x86_64 systems. If unset, x86 build is performed. @@ -615,14 +425,18 @@ VENDOR= distribute wxWidgets DLLs with your application. Default value is 'custom'. This string is included as part of DLL name. wxWidgets DLLs contain compiler name, version information and vendor name in them. For example - wxmsw290_core_bcc_custom.dll is one of DLLs build using Borland C++ with + wxmsw300_core_vc_custom.dll is one of DLLs build using Visual C++ with default settings. If you set VENDOR=mycorp, the name will change to - wxmsw290_core_bcc_mycorp.dll. + wxmsw300_core_vc_mycorp.dll. CFG= Sets configuration name so that you can have multiple wxWidgets builds with - different setup.h settings coexisting in same tree. See "Object and library - directories" below for more information. + different setup.h settings coexisting in same tree. The value of + this option is appended to the build directories names. This is + useful for building the library in some non-default configuration, + e.g. you could change wxUSE_STL to 1 in include/wx/msw/setup.h and + then build with "CFG=-stl". Alternatively, you could build with e.g. + "RUNTIME_LIBS=static CFG=-mt" when using MSVC. COMPILER_PREFIX= If you build with multiple versions of the same compiler, you can put @@ -631,86 +445,14 @@ COMPILER_PREFIX= convenience variable, you can achieve the same effect (but different directory names) with the CFG option. +CFLAGS +CXXFLAGS +CPPFLAGS +LDFLAGS + Additional flags to be used with C compiler, C++ compiler, C + preprocessor (used for both C and C++ compilation) and linker, + respectively. -Compiler-Specific Options ----------------------------------------------------------------- - -* MinGW - -If you are using gcc-2.95 instead of gcc3, you must set GCC_VERSION to -2.95. In build\msw\config.gcc, change -> GCC_VERSION = 3 -to -> GCC_VERSION = 2.95 - -* Visual C++ - -DEBUG_RUNTIME_LIBS=0 -DEBUG_RUNTIME_LIBS=1 - If set to 1, msvcrtd.dll is used, if to 0, msvcrt.dll is used. By default - msvcrtd.dll is used only if the executable contains debug info and - msvcrt.dll if it doesn't. It is sometimes desirable to build with debug info - and still link against msvcrt.dll (e.g. when you want to ship the app to - customers and still have usable .pdb files with debug information) and this - setting makes it possible. - -Fine-tuning the Compiler ----------------------------------------------------------------- - -All makefiles have variables that you can use to specify additional options -passed to the compiler or linker. You won't need this in most cases, but if you -do, simply add desired flags to CFLAGS (for C compiler), CXXFLAGS (for C++ -compiler), CPPFLAGS (for both C and C++ compiler) and LDFLAGS (the linker). - -Object and Library Directories ----------------------------------------------------------------- - -All object files produced during a library build are stored in a directory under -build\msw. Its name is derived from the build settings and CFG variable and from -the compiler name. Examples of directory names: - - build\msw\bcc_msw SHARED=0 - build\msw\bcc_mswdll SHARED=1 - build\msw\bcc_mswunivd SHARED=0, WXUNIV=1, BUILD=debug - build\msw\vc_mswunivd ditto, with Visual C++ - -Libraries and DLLs are copied into a subdirectory of the lib directory with a -name derived from the compiler and a static/DLL setting and setup.h into a -directory with a name that contains other settings: - - lib\bcc_msw - lib\bcc_lib\msw\wx\setup.h - lib\bcc_dll - lib\bcc_dll\msw\wx\setup.h - lib\bcc_lib - lib\bcc_lib\mswunivd\wx\setup.h - lib\vc_lib - lib\vc_lib\mswunivd\wx\setup.h - -Each lib\ subdirectory has wx subdirectory with setup.h as seen above. -This file is copied there from include\wx\msw\setup.h (and if it doesn't exist, -from include\wx\msw\setup0.h) and this is the copy of setup.h that is used by -all samples and should be used by your apps as well. If you are doing changes -to setup.h, you should do them in this file, _not_ in include\wx\msw\setup.h. - -If you set CFG to something, the value is appended to directory names. E.g. -for CFG=MyBuild, you'll have object files in - - build\msw\bcc_mswMyBuild - build\msw\bcc_mswdllMyBuild - etc. - -and libraries in - - lib\bcc_libMyBuild - lib\bcc_dllMyBuild - etc. - -By now it is clear what CFG is for: builds with different CFG settings don't -share any files and they use different setup.h files. For example, this allows -you to have two static debug builds, one with wxUSE_SOCKETS=0 and one with sockets -enabled (without CFG, both of them would be put into same directory and there -would be conflicts between the files). Building Applications Using wxWidgets @@ -741,8 +483,8 @@ following to use wxWidgets: * Add the list of libraries to link with to the linker input. The exact list depends on which libraries you use and whether you built wxWidgets in monolithic or default multlib mode and basically should include all the - relevant libraries from the directory above, e.g. "wxmsw29ud_core.lib - wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib + relevant libraries from the directory above, e.g. "wxmsw30ud_core.lib + wxbase30ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib" for a debug build of an application using the core library only (all wxWidgets applications use the base library). diff --git a/docs/osx/install.txt b/docs/osx/install.txt index a0ab245450..d02c9c2183 100644 --- a/docs/osx/install.txt +++ b/docs/osx/install.txt @@ -1,19 +1,18 @@ wxWidgets for Mac OS X installation ----------------------------------- -wxWidgets can be compiled using Apple's Carbon or Cocoa libraries. -Carbon is the older library, and Cocoa is the more modern library. +wxWidgets can be compiled using Apple's Cocoa or Carbon libraries. +Cocoa is the more modern library, and Carbon is the older deprecated library. -In wxWidgets 2.9.x, Cocoa is the recommended library. While Carbon is still +In wxWidgets 3, Cocoa is the recommended library. While Carbon is still supported by Apple, little new work is being done in Carbon. Most Mac OS X developers should start by downloading and installing Xcode from http://developer.apple.com. It is a free IDE from Apple that provides all of the tools you need for working with wxWidgets. -After Xcode is installed, download either wxWidgets-{version}.tar.gz or -wxMac-{version}.tar.gz and then double-click on it to unpack it to create -a wxWidgets directory. +After Xcode is installed, download wxWidgets-{version}.tar.bz2 and then +double-click on it to unpack it to create a wxWidgets directory. Next use Terminal (under Applications, Utilities, Terminal) to access a command prompt. Use cd to change directories to your wxWidgets directory and execute @@ -28,7 +27,7 @@ installed when you install Xcode 3.x. # Build the library for Cocoa (wxWidgets 2.9.0 and later) mkdir build-cocoa-debug cd build-cocoa-debug -../configure --with-osx_cocoa --enable-debug +../configure --enable-debug make # Build the samples and demos cd samples; make;cd .. @@ -39,7 +38,7 @@ cd demos; make;cd .. # Build the library for Carbon mkdir build-carbon-debug cd build-carbon-debug -../configure --enable-debug --disable-shared --enable-macosx_arch=i386 --with-macosx-sdk=/Developer/SDKs/MacOSX10.6.sdk CC=/Developer/usr/bin/gcc-4.2 CXX=/Developer/usr/bin/g++-4.2 LD=/Developer/usr/bin/ld +../configure --with-carbon --enable-debug --disable-shared --enable-macosx_arch=i386 --with-macosx-sdk=/Developer/SDKs/MacOSX10.6.sdk CC=/Developer/usr/bin/gcc-4.2 CXX=/Developer/usr/bin/g++-4.2 LD=/Developer/usr/bin/ld make # Build the samples and demos cd samples;make;cd .. @@ -48,10 +47,10 @@ cd demos; make;cd .. --------- After the compilation completes, use Finder to run the samples and demos + Go to build-cocoa-debug/samples to experiment with the Cocoa samples. + Go to build-cocoa-debug/demos to experiment with the Cocoa demos. Go to build-carbon-debug/samples to experiment with the Carbon samples. Go to build-carbon-debug/demos to experiment with the Carbon demos. - Go to build-cocoa-debug/samples to experiment with the Cocoa samples. - Go to biuld-cocoa-debug/demos to experiment with the Cocoa demos. Double-click on the executables which have an icon showing three small squares. The source code for the samples is in wxWidgets/samples The source code for the demos is in wxWidgets/demos @@ -93,8 +92,10 @@ to wx-config with the --in-place option you can avoid installing the library. Apple Developer Tools: Xcode ---------------------------- -You can use the project in src/wxWindows.xcodeproj to build wxWidgets, -and there is a sample project supplied with the minimal sample. +You can use the project in build/osx/wxcocoa.xcodeproj to build the Cocoa +version of wxWidgets (wxOSX/Cocoa) and build/osx/wxcarbon.xcodeproj to +build the Carbon version of wxWidgets (wxOSX/Carbon). There are also sample +projects supplied with the minimal sample. Notice that the command line build above builds not just the library itself but also wxrc tool which doesn't have its own Xcode project. If you need this tool, @@ -130,8 +131,8 @@ binaries together. Assuming building on a PPC system: 2. Then, build for Intel, in a different folder. This time use: -export CFLAGS="-g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" -export LDFLAGS="-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" +export CFLAGS="-g -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386" +export LDFLAGS="-syslibroot,/Developer/SDKs/MacOSX10.5.sdk" ./configure --disable-dependency-tracking --enable-static=yes --enable-shared=no \ --target=i386-apple-darwin8 --host=powerpc-apple-darwin8 --build=i386-apple-darwin8 diff --git a/docs/publicity/WoWoW30.html b/docs/publicity/WoWoW30.html index 0809990646..2832e02efd 100644 --- a/docs/publicity/WoWoW30.html +++ b/docs/publicity/WoWoW30.html @@ -41,7 +41,7 @@ mention that wxWidgets is a C++ framework for building rich GUI applications from a single source which can then be compiled on different operating systems, resulting in a native application on each system. wxWidgets uses native controls (or widgets) and other -native functions whereever possible so that the resulting +native functions wherever possible so that the resulting applications will look and feel as native as possible, and they are usually not distinguishable from applications written using single platform toolkits such as MFC for Windows, GTK+ for Linux or Cocoa @@ -51,9 +51,9 @@ achieve perfect integration with that platform.

The major operating system for which wxWidgets supports are Windows (Windows 95, NT, 2000, XP, Vista) including its mobile variants (Windows CE, PocketPC, Windows Mobile), Linux and -Unix using the GTK+ 2 toolkit (minimum version is GTK+ 2.4, more +Unix using the GTK+ 2 toolkit (minimum version is GTK+ 2.6, more recent features are used when available) and Mac OS X (minimum -version 10.4 Tiger, both Intel, PPC and the Universal Binaries for +version 10.5 Tiger, both Intel, PPC and the Universal Binaries for both are supported). wxWidgets includes many code pieces for optimising dialog and general layout for small screens such as those of the recent netbooks and mobile phones and tablets.

@@ -103,8 +103,8 @@ tries to both make use of new features of the different operating systems and support older systems for as long as possible and as long as supporting them does not hinder development for up-to-date systems. This is especially true for OS X and GTK+ 2 and it was -therefore decided that OS X versions older than 10.4 Tiger and GTK+ 2 -version older than 2.4 are no longer supported. The wxWidgets team +therefore decided that OS X versions older than 10.5 Leopard and GTK+ 2 +version older than 2.6 are no longer supported. The wxWidgets team also realized that it could not do everything and that support for a cross-platform database API was beyond the scope and focus of the project so that its old wxODBC database connectivity classes were @@ -209,7 +209,7 @@ and may thus be the most important changes from a user's perspective control used to display lists and hierarchies of name-value pairs. Like wxDataViewCtrl, it offers a number of ready-to-use editors for editing text, numbers, lists, fonts, file names etc. using in-place - editing or using pop-up dialog and combo boxes. Developement of + editing or using pop-up dialog and combo boxes. Development of wxPropertyGrid has so far taken place outside of wxWidgets as a separate project, but it has not been included in wxWidgets per se. See also wxPropertyGrid.

@@ -271,28 +271,24 @@ iPhone and iPod, and these are devices are clearly not Macs. Apart from the name change – wxMac has undergone the most fundamental changes of the three main ports, even if some of the changes were mostly reorganizing code instead of writing new code. The code has -been reorganized into common code (common to Carbon, Cocoa and Cocoa +been reorganized into common code (common to Carbon, Cocoa, and Cocoa Touch) including both general wrapping or front-end classes for much of the GUI code as well as a wrapper for the so called CoreFoundation classes of OS X, which are responsible on all OS X variants for string manipulation, font support, graphics and other basic -functionality (CoreImage and CoreVideo have recently been added by -Apple) and toolkit dependent code for the Carbon, Cocoa and Cocoa -Touch API. The Carbon variant is the core of what used to be wxMac -and is the most stable and mature version. The reason behind adding -optional support for Cocoa and Cocoa Touch is that Carbon is not -available on iPhones at all and that it has been deprecated for all -64-bit versions of OS X, which is likely to be the default a few -years from now. So while present applications using wxOSX are advised -to use the Carbon backend due its maturity, future developement will -have to focus on the Cocoa backend.

+functionality and toolkit dependent code for the Carbon, Cocoa, and +Cocoa Touch API. wxOSX/Carbon is the core of what used to be wxMac +and is now deprecated in favour of wxOSX/Cocoa. Existing applications +are encouraged to switch to wxOSX/Cocoa as Carbon is a deprecated OS X +feature, not available for 64-bit GUI applications, and not available for +iOS devices at all.

As part of the restructuring, all remaining drawing code using the old QuickDraw API has been removed (it was only an option before) and drawing now always takes place using CoreGraphics. Likewise, all code using Carbon functions no longer present in OS X -10.4 has been removed to clean-up the code greatly. This is turn +10.4 and 10.5 has been removed to clean-up the code greatly. This is turn means, as mentioned above, that applications will require a minimum -of OS X 10.4 in order to run, better yet OS X 10.5.

+of OS X 10.5 in order to run.

Apart from these large changes, these additional features can be noted:

    @@ -311,7 +307,7 @@ compatible way. The main problem of this approach is that applications written using wxGTK should work with relatively old versions of GTK+ but should also make use of recent features. In some cases, supporting an old version of GTK+ hinders development so we -decided to declare GTK+ 2.4 the minimum toolkit version that is +decided to declare GTK+ 2.6 the minimum toolkit version that is supported. As an example, this made it possible to always use the GTK+ file dialog instead of the old generic file dialog which had to be used when GTK+ didn't have a usable file dialog. diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt index 15daa8b3dd..afdd6498f8 100644 --- a/docs/publicity/announce.txt +++ b/docs/publicity/announce.txt @@ -1,13 +1,15 @@ -October 7, 2013 -- The wxWidgets team is pleased to announce the -first release candidate release of wxWidgets 3.0. +November 11, 2013 -- The wxWidgets team is pleased to announce a +major new release of our open source framework for the development +of native cross-platform applications in C++. -wxWidgets 3.0-RC1 is available at +wxWidgets 3.0.0 is the first release in the new major stable 3.0 +branch and is available at - https://sourceforge.net/downloads/wxwindows/3.0.0-rc1/ + https://sourceforge.net/downloads/wxwindows/3.0.0/ and at our FTP mirror at - ftp://ftp.wxwidgets.org/pub/3.0.0-rc1/ + ftp://ftp.wxwidgets.org/pub/3.0.0/ Please choose the archive format suitable for your platform, i.e. 7z or ZIP for Windows platforms and tar.bz2 for the Unix systems @@ -22,9 +24,6 @@ selected compilers at https://sourceforge.net/downloads/wxwindows/3.0.0/binaries/ -Notice that 3.0-RC1 does NOT include the binaries, they will be only -available for the final 3.0 release. - Please see the README file there for the descriptions of the individual files. @@ -44,20 +43,20 @@ here, but the most important ones are: Please see the changes.txt file in the "docs" subdirectory of wxWidgets distribution or also available online at -https://sourceforge.net/projects/wxwindows/files/3.0.0-rc1/changes.txt +https://sourceforge.net/projects/wxwindows/files/3.0.0/changes.txt for more details and please read the "INCOMPATIBLE CHANGES" section in its beginning for a brief description of changes if you are upgrading from wxWidgets 2.8. For more details, please see http://docs.wxwidgets.org/3.0.0/overview_changes_since28.html -Please test this release candidate version to help us with making the -final 3.0 release as problem-free as possible. We are especially -looking forward to your feedback about the changes in this release -compared to 2.8 version if you're upgrading. Please let us know about -any regressions (http://trac.wxwidgets.org/newticket) so that we could -fix them in the upcoming 3.0. +We recommend that you use wxWidgets 3.0 for any new programs and +also update any existing code using the older versions to the new +one (which should be easier than the jump in the version number +indicates) as all the future development will only happen in 3.x +series. - Thanks in advance! + +We hope that you will enjoy using the new release! Vadim Zeitlin, on behalf of wxWidgets development team. diff --git a/docs/readme.txt b/docs/readme.txt index 7545ad2b52..b9d167d1be 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,20 +1,28 @@ - wxWidgets 3.0-RC1 Release Notes - =============================== + wxWidgets 3.0.0 Release Notes + ============================= -Welcome to the latest release of wxWidgets, a free cross-platform C++ -framework for writing advanced GUI applications using native controls. +Welcome to the latest release of wxWidgets, a free and open source +cross-platform C++ framework for writing advanced GUI applications +using native controls. -In addition to common and advanced GUI facilities such as frames, -scrolling windows, toolbars, tree controls, icons, device contexts, -printing, splitter windows and so on, there are wrappers for common -file operations, facilities for writing network applications, -thread handling, and so on. You can learn more about wxWidgets at +wxWidgets allows you to write native-looking GUI applications for +all the major desktop platforms and also helps with abstracting +the differences in the non-GUI aspects between them. It is free +for the use in both open source and commercial applications, comes +with the full, easy to read and modify, source and extensive +documentation and a collection of more than a hundred examples. +You can learn more about wxWidgets at http://www.wxwidgets.org/ +and read its documentation online at -wxWidgets sources are available for download from + http://docs.wxwidgets.org/3.0.0/ + + +wxWidgets sources and binaries for the selected platforms are +available for download from https://sourceforge.net/projects/wxwindows/files/3.0.0/ @@ -26,12 +34,6 @@ Please see the "Files" section below for the description of various files available at these locations. -A detailed reference manual including in-depth overviews for various -topics is supplied in various formats and can be accessed online at - - http://docs.wxwidgets.org/3.0.0/ - - Changes in this release ----------------------- @@ -39,7 +41,7 @@ Changes in this release This release contains several years worth of improvements compared to 2.8 version. Notably, Unicode support has been completely overhauled and made much easier to use. Debugging support, including -when using a release build of the library, was much improved making +when using a release build of the library, was greatly improved making it less likely that you use the library incorrectly. Dynamic event handling was made much more comfortable. Many new GUI and base classes have been added or improved and all ports, and especially wxOSX/Cocoa @@ -63,9 +65,9 @@ Platforms supported wxWidgets currently supports the following primary platforms: -- Windows 95/98/ME, NT, 2000, XP, Vista, 7 +- Windows 95/98/ME, NT, 2000, XP, Vista, 7 (32/64 bits). - Most Unix variants using the GTK+ toolkit (version 2.6 or newer) -- Mac OS X (10.5 or newer) using either Carbon or Cocoa +- Mac OS X (10.5 or newer) using Cocoa (32/64 bits) or Carbon (32 only) There is some support for the following platforms: @@ -98,8 +100,8 @@ In addition to the sources, documentation in HTML, CHM and HTB for Microsoft Windows. Notice that you will still need to compile wxWidgets even when using the installer. -Experimentally, we also supply binaries of wxMSW libraries built -with several versions of Microsoft Visual C++ compiler for this +We also supply binaries of wxMSW libraries built with several +versions of Microsoft Visual C++ and GNU g++ compiler for this release. They are available in the "binaries" subdirectory, see the description of the files in the README file there. @@ -107,10 +109,11 @@ the description of the files in the README file there. Installation ------------ -wxWidgets needs to be compiled before you can test out the samples -or write your own applications. For installation information, please -see the install.txt file in the docs subdirectory appropriate for -the platform you use. +Unless you have downloaded the binaries for your compiler, you +will need to build wxWidgets before you can test out the samples +or write your own applications. For installation information, +please see the install.txt file in the docs subdirectory +appropriate for the platform you use. Licence information @@ -136,13 +139,7 @@ applications using wxWidgets. However, if you distribute wxGTK or wxMotif (with Lesstif) version of your application, don't forget that it is linked against GTK+ (or Lesstif) which is covered by LGPL *without* -exception notice. Under Linux systems your app is probably linked -against LGPL glibc as well. Please read carefully LGPL, section -6. which describes conditions for distribution of closed source -applications linked against LGPL library. Basically you should -link dynamically and include source code of LGPL libraries with -your product (unless it is already present in user's system - -like glibc usually is). +exception notice and so is bound by its requirements. If you use TIFF image handler, please see src/tiff/COPYRIGHT for libtiff licence details. @@ -156,16 +153,17 @@ If you use wxRegEx class on a system without native regular expressions support (i.e. MS Windows), see src/regex/COPYRIGHT file for Henry Spencer's regular expression library copyright. -If you use wxXML classes or XRC, see src/expat/COPYING for licence details. +If you use wxXML classes or XRC, see src/expat/COPYING for licence +details. Documentation ------------- wxWidgets documentation is available online at -http://docs.wxwidgets.org/3.0.0/ and can also be downloaded in HTML -format. To generate documentation in other formats (PDF, CHM, ...) -please use the scripts in docs/doxygen directory. +http://docs.wxwidgets.org/3.0.0/ and can also be downloaded in +HTML format. To generate documentation in other formats (PDF, CHM, +...) please use the scripts in docs/doxygen directory. Bug reporting @@ -188,19 +186,14 @@ addressed sooner. Further information ------------------- -The wxWidgets Web site is located at: +If you are looking for support, you can get it from - http://www.wxwidgets.org/ +- wxForum at http://forums.wxwidgets.org/ +- wx-users mailing list (http://www.wxwidgets.org/support/maillst2.htm) +- #wxwidgets IRC channel +- http://stackoverflow.com/ if you tag your question with "wxwidgets" -The main wxWidgets ftp site is at: - - ftp://ftp.wxwidgets.org/pub/ - -A wxWidgets CD-ROM with the latest distribution plus an HTML -front-end and hundreds of MB of compilers, utilities and other -material may be ordered from the CD-ROM page: see the wxWidgets -web site. Have fun! -The wxWidgets Team, July 2013 +The wxWidgets Team, November 2013 diff --git a/docs/release_binaries.mdwn b/docs/release_binaries.mdwn index 1195553fc0..72dbd9a2c3 100644 --- a/docs/release_binaries.mdwn +++ b/docs/release_binaries.mdwn @@ -1,7 +1,7 @@ -wxWidgets 3.0.0-rc2 Binaries -============================ +wxWidgets 3.0.0 Binaries +======================== -This directory contains binary files for wxWidgets 3.0.0-rc2 release. +This directory contains binary files for wxWidgets 3.0.0 release. * Microsoft Visual C++ compiler versions 9.0, 10.0, 11.0 and 12.0 corresponding to marketing product names of Microsoft Visual Studio @@ -14,9 +14,10 @@ For Developers -------------- For developing applications with wxWidgets you need to download the -compiler-independent wxWidgets-3.0.0-rc2_Headers.7z file and one of -wxMSW-3.0.0-rc2-vcXXX_Dev.7z or wxMSW-3.0.0-rc2_gccXXX_Dev.7z files -depending on your compiler and its version. +compiler-independent wxWidgets-3.0.0_Headers.7z file (found in the +parent directory) and one of wxMSW-3.0.0-vcXXX_Dev.7z or +wxMSW-3.0.0_gccXXX_Dev.7z files depending on your compiler, its +version and the target architecture (x86 if not specified or x64). Unpack both files into the same directory so that "include" and "lib" directories are at the same level after unpacking. You should be able @@ -29,15 +30,15 @@ symbols. For End Users ------------- -End users may download one of wxMSW-3.0.0-rc2_vcXXX_ReleaseDLL.7z or -wxMSW-3.0.0-rc2_gccXXX_ReleaseDLL.7z files to get just the DLLs +End users may download one of wxMSW-3.0.0_vcXXX_ReleaseDLL.7z or +wxMSW-3.0.0_gccXXX_ReleaseDLL.7z files to get just the DLLs required for running the applications using wxWidgets. For Debugging ------------- -* Microsoft Visual C++ users: Files wxMSW-3.0.0-rc2_vcXXX_ReleasePDB.7z +* Microsoft Visual C++ users: Files wxMSW-3.0.0_vcXXX_ReleasePDB.7z contain the debug symbols for the release build of the DLLs. Download them if you want to debug your own applications in release build or if you want to get meaningful information from mini-dumps retrieved @@ -62,32 +63,46 @@ Check Sums To verify your download you can use the following sha1sums: - 23c043ccfc76d7f55db972e165d90c102ac444e4 wxMSW-3.0.0-rc2_vc100_Dev.7z - a29b1701e601421d90d38234fecafa5ea089108e wxMSW-3.0.0-rc2_vc100_ReleaseDLL.7z - e320f53d3524200cafe9b93422de49b3387f2c72 wxMSW-3.0.0-rc2_vc100_ReleasePDB.7z - b9c4a0780f1d0e1a4b05fa77fc169310562d0d66 wxMSW-3.0.0-rc2_vc100_x64_Dev.7z - bfe474fe29eed0ffb567556995f98051dcdfbb89 wxMSW-3.0.0-rc2_vc100_x64_ReleaseDLL.7z - 1a4aa9a983987cd2ab9e6398cb11dedfd66bea2d wxMSW-3.0.0-rc2_vc100_x64_ReleaseDLL.msi - 0d89da7e3e72b094a04ae37e49e30197e6e33bcb wxMSW-3.0.0-rc2_vc100_x64_ReleasePDB.7z - e4d31dcca207616ab9d0b9702976a2b21ae126a1 wxMSW-3.0.0-rc2_vc100_x86_ReleaseDLL.msi - 05aa6624ff1fab4a9ed2c639327648dcafda0efd wxMSW-3.0.0-rc2_vc110_Dev.7z - ebbd9be982aa66abf3793e8700be98d14486fe0c wxMSW-3.0.0-rc2_vc110_ReleaseDLL.7z - 79c0f8bb3d4197c83a14991b98bf65386be9951c wxMSW-3.0.0-rc2_vc110_ReleasePDB.7z - a2a109293b88decc944e43966bbaab90a049d398 wxMSW-3.0.0-rc2_vc110_x64_Dev.7z - bceedf4c1c131a1b37d5421c48f0f9098009b3bc wxMSW-3.0.0-rc2_vc110_x64_ReleaseDLL.7z - bb034c5d0f573054afd2864460e22bf95767cca4 wxMSW-3.0.0-rc2_vc110_x64_ReleaseDLL.msi - 12721bf2607a412f18c620c52db30fa56629c066 wxMSW-3.0.0-rc2_vc110_x64_ReleasePDB.7z - d4da114c62ea4f246f907981447205bb90007e8b wxMSW-3.0.0-rc2_vc110_x86_ReleaseDLL.msi - 6f09a33634736cf7caa7c0acddea34d1d119cfae wxMSW-3.0.0-rc2_vc90_Dev.7z - 640784f90996625fcc2a3b62c99b92936dfae2ce wxMSW-3.0.0-rc2_vc90_ReleaseDLL.7z - 2a36ad418c856caa040d4efc8807dbb75dd88330 wxMSW-3.0.0-rc2_vc90_ReleasePDB.7z - f356b8edc7445271ce5a77c41f6b1370154d9799 wxMSW-3.0.0-rc2_vc90_x64_Dev.7z - 282f02c23e7bcb331b1373a2b0b8a2f59f7d7a6e wxMSW-3.0.0-rc2_vc90_x64_ReleaseDLL.7z - 69096f6ff598285e0a8117caba879b10c4b08528 wxMSW-3.0.0-rc2_vc90_x64_ReleaseDLL.msi - 30c7442d37646b7c9d8a7be3d174b5b7c24cb093 wxMSW-3.0.0-rc2_vc90_x64_ReleasePDB.7z - d1fa1c531c1bdf1d7c8806038b51a5dab0fce158 wxMSW-3.0.0-rc2_vc90_x86_ReleaseDLL.msi - c084e9a5af9c082b9d201c0fee2919d7265578bb wxWidgets-3.0.0-rc2_Headers.7z - + 4c6bf24df85bc0fb1bce3091557963ec4c79b5f4 wxMSW-3.0.0_gcc471TDM_Dev.7z + c35de8230a0e006883b58078b1bcb597a923b110 wxMSW-3.0.0_gcc471TDM_ReleaseDLL.7z + 5844ad74ef07f468f36a4b232e28bb5c6753eb91 wxMSW-3.0.0_gcc471TDM_x64_Dev.7z + df3129074172278d1837d7c7698e5466dcdd87af wxMSW-3.0.0_gcc471TDM_x64_ReleaseDLL.7z + 34268fdd29b3d3b904234796cae847c9648119f7 wxMSW-3.0.0_gcc481TDM_Dev.7z + 15871a10eb3d2c005e34ea20ea921400d51b7392 wxMSW-3.0.0_gcc481TDM_ReleaseDLL.7z + 3f89fd4e8f78f26c18cfee4781a2a6c1e3ae2655 wxMSW-3.0.0_gcc481TDM_x64_Dev.7z + 013c2f7ab65182f8c6c9d805a16d23827ed24c9e wxMSW-3.0.0_gcc481TDM_x64_ReleaseDLL.7z + 1a3ba38a309182a32f24225f392b3a35a31f9ea1 wxMSW-3.0.0_vc90_Dev.7z + 97ace7370b85813cb04196fbe71bc1caeb08bb79 wxMSW-3.0.0_vc90_ReleaseDLL.7z + ad98029154d9a0ef2d7d62756f796c82715a2c02 wxMSW-3.0.0_vc90_x86_ReleaseDLL.msi + 83c727c2337eaee4dc93e90d33a85b0dafe9b745 wxMSW-3.0.0_vc90_ReleasePDB.7z + b14eb5cab613cc583ada83ed38113dee9b8b08bb wxMSW-3.0.0_vc90_x64_Dev.7z + 1cf0d5918e961e31b67d70530e00be6cac06af57 wxMSW-3.0.0_vc90_x64_ReleaseDLL.7z + 6ab1d777b784c7e02a331577f6d676f51261af25 wxMSW-3.0.0_vc90_x64_ReleaseDLL.msi + 839e5033e760508a3d50314056821a7e91a4a2e4 wxMSW-3.0.0_vc90_x64_ReleasePDB.7z + 397ee6d2de469647a3444df1def495bb16ba54b0 wxMSW-3.0.0_vc100_Dev.7z + 0e1b88b313ff438c1db840a60d146dee218deb6f wxMSW-3.0.0_vc100_ReleaseDLL.7z + 25cc1e30d09ae3823288e224572e2b5d89673b2a wxMSW-3.0.0_vc100_x86_ReleaseDLL.msi + 229136142f7d2980be72265ecc50eeea0096afca wxMSW-3.0.0_vc100_ReleasePDB.7z + 3e4e5a7a1eb800fe9d9be658c655ca49d6260791 wxMSW-3.0.0_vc100_x64_Dev.7z + eda263f3b1aae120e802aeab43ccc3ee45411a9e wxMSW-3.0.0_vc100_x64_ReleaseDLL.7z + 8991eb4d14f0b37a6aeed8f1f2ef71e2ee961fb0 wxMSW-3.0.0_vc100_x64_ReleaseDLL.msi + 86661c50965b3619f3d0f68a900ec8e1e0eaf9fb wxMSW-3.0.0_vc100_x64_ReleasePDB.7z + 2c25693325f8516a4e923fd520b540a4947b2757 wxMSW-3.0.0_vc110_Dev.7z + 1c81fd5cdb4c62c1494accc7f1c9ba9acabfa79c wxMSW-3.0.0_vc110_ReleaseDLL.7z + aab75c6db1d491d38544d4feaf721931ee7aabb3 wxMSW-3.0.0_vc110_x86_ReleaseDLL.msi + 4dbb2058b6c8c11e9d906f6520792103779c8518 wxMSW-3.0.0_vc110_ReleasePDB.7z + c64b64138450ce35c385f9f9d01ee44fb27a59b1 wxMSW-3.0.0_vc110_x64_Dev.7z + 5503382c0a1b2148fed5d856fc5ddfc01e59dada wxMSW-3.0.0_vc110_x64_ReleaseDLL.7z + 7da39e4370391e41e13d2be9f7d59b36a78a8a8c wxMSW-3.0.0_vc110_x64_ReleaseDLL.msi + cff85ab5a0a560cac5d1f196a8cf0a1c1025aab8 wxMSW-3.0.0_vc110_x64_ReleasePDB.7z + 448827167a64a9a7c270774d62d8673445acbe63 wxMSW-3.0.0_vc120_Dev.7z + 0df76ee66bea2b3c312c4a67d5b6383440a85d22 wxMSW-3.0.0_vc120_ReleaseDLL.7z + 7e3249a3b989340fc3e87b1ba0031563d326cd92 wxMSW-3.0.0_vc120_x86_ReleaseDLL.msi + d74c3913389b8c441480b1a9d4c79211a457c05b wxMSW-3.0.0_vc120_ReleasePDB.7z + 9f6b3290f5fd3b179ff148d1cfc2748ddc0839a9 wxMSW-3.0.0_vc120_x64_Dev.7z + d2d555d923f18b71d5f0538e88a8740573df12a6 wxMSW-3.0.0_vc120_x64_ReleaseDLL.7z + 9383ee555c45772865b01260da9d02a8658683da wxMSW-3.0.0_vc120_x64_ReleaseDLL.msi + d3f24aa95d80f4a04d2b211b99fae7ca368e77b6 wxMSW-3.0.0_vc120_x64_ReleasePDB.7z Credit diff --git a/docs/release_files.mdwn b/docs/release_files.mdwn index 349482d686..b50ffe0b24 100644 --- a/docs/release_files.mdwn +++ b/docs/release_files.mdwn @@ -1,7 +1,9 @@ -wxWidgets 3.0.0-RC1 -=================== +wxWidgets 3.0.0 +=============== -This directory contains the files for wxWidgets 3.0.0-rc1 release. +This directory contains the files containing the sources and documentation of +wxWidgets 3.0.0 release. Please see the binaries subdirectory for the binaries +for the selected platforms/compilers. Please notice that since the 2.9 series only a single source distribution is provided instead of the multiple distributions containing only the files for @@ -24,10 +26,11 @@ Check Sums To verify your download you can use the following sha1sums: - 0b6f7fbac35c4e923cc7fa73e9c8d8ad3dd8e085 wxWidgets-3.0.0-rc1.7z - ae15323ae8c7682f65d9bf58e2ae3fff0af5e816 wxWidgets-3.0.0-rc1.tar.bz2 - ca272772d9d5c59372ca976375da600e2d7fc2ee wxWidgets-3.0.0-rc1.zip - f344ffa557a5b24b85b612f08f6fae2cf9ca336f wxWidgets-3.0.0-rc1-docs-chm.zip - 4f120cbbdffd7b837cb1afdfa5f4a4fbe1c160b4 wxWidgets-3.0.0-rc1-docs-html.tar.bz2 - 8ba6522c78b77bb0d3a8fbea6c4f4d0e11ec8d24 wxWidgets-3.0.0-rc1-docs-html.zip - 2334dbd62b137957d31a529ab44fab25ce040320 wxWidgets-3.0.0-rc1_headers.7z + d19985b4ea4277ac7707615b7c00b15e3d58d2c0 wxWidgets-3.0.0.7z + 756a9c54d1f411e262f03bacb78ccef085a9880a wxWidgets-3.0.0.tar.bz2 + becf924bb06441bfd2e7f3f4bf4501e58ff5c7b8 wxWidgets-3.0.0.zip + 6950f26601f5b71f955803854b19dce22af5e020 wxWidgets-3.0.0-docs-html.tar.bz2 + b2909e17d19765cedf9d79793a78c3f7eda7d88b wxWidgets-3.0.0-docs-html.zip + bf0d8baa476baba8ac13442a6c9cd74c2f356993 wxWidgets-3.0.0-docs-chm.zip + 2f4f7013845930e069b4f3c5226d771eadee6986 wxWidgets-3.0.0_headers.7z + ff997beecf047ef9c94a1caccd9770300033c136 wxMSW-3.0.0-Setup.exe diff --git a/docs/tech/tn0022.txt b/docs/tech/tn0022.txt index 0465b0d83d..fead3c9a80 100644 --- a/docs/tech/tn0022.txt +++ b/docs/tech/tn0022.txt @@ -4,6 +4,8 @@ Before making the release ------------------------- +Change the version in include/wx/version.h. + Update docs/readme.txt. Please review its contents in addition to just changing the version number. diff --git a/include/wx/buffer.h b/include/wx/buffer.h index c88e160270..9891494d97 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -268,9 +268,22 @@ public: wxCharTypeBuffer(size_t len) { - this->m_data = - new Data((CharType *)malloc((len + 1)*sizeof(CharType)), len); - this->m_data->Get()[len] = (CharType)0; + CharType* const str = (CharType *)malloc((len + 1)*sizeof(CharType)); + if ( str ) + { + str[len] = (CharType)0; + + // There is a potential memory leak here if new throws because it + // fails to allocate Data, we ought to use new(nothrow) here, but + // this might fail to compile under some platforms so until this + // can be fully tested, just live with this (rather unlikely, as + // Data is a small object) potential leak. + this->m_data = new Data(str, len); + } + else + { + this->m_data = this->GetNullData(); + } } wxCharTypeBuffer(const wxCharTypeBuffer& src) diff --git a/include/wx/combo.h b/include/wx/combo.h index 4bae2cfea6..6a040b3d22 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -560,7 +560,7 @@ protected: // just recalculate. void CalculateAreas( int btnWidth = 0 ); - // Standard textctrl positioning routine. Just give it platform-dependant + // Standard textctrl positioning routine. Just give it platform-dependent // textctrl coordinate adjustment. virtual void PositionTextCtrl( int textCtrlXAdjust = 0, int textCtrlYAdjust = 0); @@ -701,7 +701,7 @@ protected: // area used by the button wxSize m_btnSize; - // platform-dependant customization and other flags + // platform-dependent customization and other flags wxUint32 m_iFlags; // custom style for m_text diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h index 8649187c09..5fc7cc5cf1 100644 --- a/include/wx/msw/combobox.h +++ b/include/wx/msw/combobox.h @@ -133,6 +133,9 @@ protected: virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; + // Override this one to avoid eating events from our popup listbox. + virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const; + // this is the implementation of GetEditHWND() which can also be used when // we don't have the edit control, it simply returns NULL then // diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 29897ad9c3..35bf74e9fe 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -121,6 +121,9 @@ protected: // one virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd); + // Look in our GetSubcontrols() for the windows with the given ID. + virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const; + // for controls like radiobuttons which are really composite this array // holds the ids (not HWNDs!) of the sub controls wxArrayLong m_subControls; diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h index 692f19ef35..e92a88d841 100644 --- a/include/wx/msw/msvcrt.h +++ b/include/wx/msw/msvcrt.h @@ -37,7 +37,12 @@ #endif #include - #ifndef _CRTBLD + + // Defining _CRTBLD should never be necessary at all, but keep it for now + // as there is no time to retest all the compilers before 3.0 release. + // Definitely do not use it with MSVS 2013 as defining it results in errors + // if the standard is included afterwards. + #if !defined(_CRTBLD) && !wxCHECK_VISUALC_VERSION(12) // Needed when building with pure MS SDK #define _CRTBLD #endif diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h index 8f85141f1e..1d1eb33af3 100644 --- a/include/wx/msw/ole/automtn.h +++ b/include/wx/msw/ole/automtn.h @@ -116,13 +116,13 @@ public: void SetLCID(WXLCID lcid); // Returns the flags used for conversions between wxVariant and OLE - // VARIANT, see wxConvertVariantToOleFlags. The default value is + // VARIANT, see wxOleConvertVariantFlags. The default value is // wxOleConvertVariant_Default but all the objects obtained by GetObject() // inherit the flags from the one that created them. long GetConvertVariantFlags() const; // Sets the flags used for conversions between wxVariant and OLE VARIANT, - // see wxConvertVariantToOleFlags (default is wxOleConvertVariant_Default. + // see wxOleConvertVariantFlags (default is wxOleConvertVariant_Default. void SetConvertVariantFlags(long flags); public: // public for compatibility only, don't use m_dispatchPtr directly. diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 3475f3d6b7..bd793e143b 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -206,7 +206,7 @@ public: // to understand why does it work, look at SubclassWin() code and comments bool IsOfStandardClass() const { return m_oldWndProc != NULL; } - wxWindow *FindItem(long id) const; + wxWindow *FindItem(long id, WXHWND hWnd = NULL) const; wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; // MSW only: true if this control is part of the main control @@ -663,6 +663,15 @@ protected: bool MSWEnableHWND(WXHWND hWnd, bool enable); + // Return the pointer to this window or one of its sub-controls if this ID + // and HWND combination belongs to one of them. + // + // This is used by FindItem() and is overridden in wxControl, see there. + virtual wxWindow* MSWFindItem(long WXUNUSED(id), WXHWND WXUNUSED(hWnd)) const + { + return NULL; + } + private: // common part of all ctors void Init(); diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h index 767ee9c8bb..0eba951444 100644 --- a/include/wx/osx/app.h +++ b/include/wx/osx/app.h @@ -143,7 +143,7 @@ public: virtual void MacNewFile() ; // in response of a reopen-application apple event virtual void MacReopenApp() ; - + // override this to return false from a non-bundled console app in order to stay in background ... virtual bool OSXIsGUIApplication() { return true; } diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h index 53604bab7b..a52620b5c7 100644 --- a/include/wx/osx/textctrl.h +++ b/include/wx/osx/textctrl.h @@ -74,10 +74,6 @@ public: virtual void MarkDirty(); virtual void DiscardEdits(); - // set the grayed out hint text - virtual bool SetHint(const wxString& hint); - virtual wxString GetHint() const; - // text control under some platforms supports the text styles: these // methods apply the given text style to the given selection or to // set/get the style which will be used for all appended text @@ -151,7 +147,6 @@ protected: private : wxMenu *m_privateContextMenu; - wxString m_hintString; DECLARE_EVENT_TABLE() }; diff --git a/include/wx/osx/textentry.h b/include/wx/osx/textentry.h index 2362cae8af..12d780778a 100644 --- a/include/wx/osx/textentry.h +++ b/include/wx/osx/textentry.h @@ -81,6 +81,10 @@ public: virtual bool SendMaxLenEvent(); + // set the grayed out hint text + virtual bool SetHint(const wxString& hint); + virtual wxString GetHint() const; + // Implementation // -------------- @@ -102,6 +106,8 @@ protected: // need to make this public because of the current implementation via callbacks unsigned long m_maxLength; +private: + wxString m_hintString; }; #endif // _WX_OSX_TEXTENTRY_H_ diff --git a/include/wx/private/textmeasure.h b/include/wx/private/textmeasure.h index 69fbf85ab2..a4db67cb50 100644 --- a/include/wx/private/textmeasure.h +++ b/include/wx/private/textmeasure.h @@ -156,7 +156,7 @@ protected: wxDECLARE_NO_COPY_CLASS(wxTextMeasureBase); }; -// Include the platform dependant class declaration, if any. +// Include the platform dependent class declaration, if any. #if defined(__WXGTK20__) #include "wx/gtk/private/textmeasure.h" #elif defined(__WXMSW__) diff --git a/include/wx/selstore.h b/include/wx/selstore.h index 4361a11a9c..62ff2298ce 100644 --- a/include/wx/selstore.h +++ b/include/wx/selstore.h @@ -80,7 +80,7 @@ public: private: // (re)init - void Init() { m_defaultState = false; } + void Init() { m_count = 0; m_defaultState = false; } // the total number of items we handle unsigned m_count; diff --git a/include/wx/version.h b/include/wx/version.h index c762d9a9f0..da3b44c7f1 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -29,7 +29,7 @@ #define wxMINOR_VERSION 0 #define wxRELEASE_NUMBER 0 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 3.0.0 RC1") +#define wxVERSION_STRING wxT("wxWidgets 3.0.0") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/interface/wx/filename.h b/interface/wx/filename.h index 344b5f8225..9477201b69 100644 --- a/interface/wx/filename.h +++ b/interface/wx/filename.h @@ -1271,7 +1271,7 @@ public: @return @true on success, @false if an error occurred (for example, the file doesn't exist). */ - bool SetPermissions(int permissions) + bool SetPermissions(int permissions); /** Sets the file creation and last access/modification times (any of the pointers diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h index 96b3457508..8e2113bea6 100644 --- a/interface/wx/graphics.h +++ b/interface/wx/graphics.h @@ -9,7 +9,7 @@ @class wxGraphicsPath A wxGraphicsPath is a native representation of a geometric path. The - contents are specific an private to the respective renderer. Instances are + contents are specific and private to the respective renderer. Instances are reference counted and can therefore be assigned as usual. The only way to get a valid instance is by using wxGraphicsContext::CreatePath() or wxGraphicsRenderer::CreatePath(). diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h index f2550038bc..aecce9956f 100644 --- a/interface/wx/listctrl.h +++ b/interface/wx/listctrl.h @@ -1372,7 +1372,7 @@ public: /** The data. */ - long GetData() const; + wxUIntPtr GetData() const; /** The image. diff --git a/interface/wx/menu.h b/interface/wx/menu.h index 9571021c8d..636771f2e1 100644 --- a/interface/wx/menu.h +++ b/interface/wx/menu.h @@ -433,8 +433,8 @@ public: @note Please note that @e wxID_ABOUT and @e wxID_EXIT are predefined by wxWidgets and have a special meaning since entries using these IDs will be taken out - of the normal menus under MacOS X and will be inserted into the system menu - (following the appropriate MacOS X interface guideline). + of the normal menus under OS X and will be inserted into the system menu + (following the appropriate OS X interface guideline). Menu items may be either @e normal items, @e check items or @e radio items. Normal items don't have any special properties while the check items have a diff --git a/interface/wx/msw/ole/automtn.h b/interface/wx/msw/ole/automtn.h index 5f2dd6775d..893293a3e4 100644 --- a/interface/wx/msw/ole/automtn.h +++ b/interface/wx/msw/ole/automtn.h @@ -610,7 +610,7 @@ public: /** Returns the flags used for conversions between wxVariant and OLE - VARIANT, see wxConvertVariantToOleFlags. + VARIANT, see wxOleConvertVariantFlags. The default value is wxOleConvertVariant_Default for compatibility but it can be changed using SetConvertVariantFlags(). @@ -624,7 +624,7 @@ public: /** Sets the flags used for conversions between wxVariant and OLE VARIANT, - see wxConvertVariantToOleFlags. + see wxOleConvertVariantFlags. The default value is wxOleConvertVariant_Default. diff --git a/locale/eu.po b/locale/eu.po index 689ecdd421..c36a2bb1e4 100644 --- a/locale/eu.po +++ b/locale/eu.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: wxWidgets 3.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-01 19:04+0200\n" -"PO-Revision-Date: 2013-08-23 19:26+0100\n" +"PO-Revision-Date: 2013-11-02 14:37+0100\n" "Last-Translator: Xabier Aramendi (Azpidatziak) \n" "Language-Team: (EUS_Xabier Aramendi) \n" "Language: eu\n" @@ -1146,14 +1146,12 @@ msgid "Add" msgstr "Gehitua" #: ../src/richtext/richtextbuffer.cpp:10751 -#, fuzzy msgid "Add Column" -msgstr "Gehitu zutabea" +msgstr "Gehitu Zutabea" #: ../src/richtext/richtextbuffer.cpp:10688 -#, fuzzy msgid "Add Row" -msgstr "Gehitu lerroa" +msgstr "Gehitu Lerroa" #: ../src/html/helpwnd.cpp:439 msgid "Add current page to bookmarks" @@ -2576,14 +2574,12 @@ msgid "Delete A&ll" msgstr "Ezabatu &Denak" #: ../src/richtext/richtextbuffer.cpp:10637 -#, fuzzy msgid "Delete Column" -msgstr "Ezabatu zutabea" +msgstr "Ezabatu Zutabea" #: ../src/richtext/richtextbuffer.cpp:10587 -#, fuzzy msgid "Delete Row" -msgstr "Ezabatu lerroa" +msgstr "Ezabatu Lerroa" #: ../src/richtext/richtextstyledlg.cpp:779 msgid "Delete Style" diff --git a/locale/nl.po b/locale/nl.po index 5925463f97..9cab6a67c9 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: wxWidgets 3.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-01 19:04+0200\n" -"PO-Revision-Date: 2013-07-31 14:30+0100\n" +"PO-Revision-Date: 2013-10-30 10:18+0100\n" "Last-Translator: Dingoe \n" "Language-Team: wxWidgets translators \n" "Language: nl_NL\n" @@ -1145,14 +1145,12 @@ msgid "Add" msgstr "Toevoegen" #: ../src/richtext/richtextbuffer.cpp:10751 -#, fuzzy msgid "Add Column" -msgstr "Voeg kolom toe" +msgstr "Kolom toevoegen" #: ../src/richtext/richtextbuffer.cpp:10688 -#, fuzzy msgid "Add Row" -msgstr "voeg rij toe" +msgstr "Rij toevoegen" #: ../src/html/helpwnd.cpp:439 msgid "Add current page to bookmarks" @@ -1667,7 +1665,7 @@ msgstr "Kan niet schrijven naar deflate stream: %s" #: ../src/msw/msgdlg.cpp:489 ../src/msw/progdlg.cpp:673 #: ../src/gtk1/fontdlg.cpp:144 ../src/motif/msgdlg.cpp:196 msgid "Cancel" -msgstr "Annuleer" +msgstr "Annuleren" #: ../src/os2/thread.cpp:116 msgid "Cannot create mutex." @@ -2579,12 +2577,10 @@ msgid "Delete A&ll" msgstr "A&lles verwijderen" #: ../src/richtext/richtextbuffer.cpp:10637 -#, fuzzy msgid "Delete Column" msgstr "Kolom verwijderen" #: ../src/richtext/richtextbuffer.cpp:10587 -#, fuzzy msgid "Delete Row" msgstr "Rij verwijderen" @@ -6322,7 +6318,7 @@ msgid "" "[Cancel] if it cannot be replaced" msgstr "" "De tekenset '%s' is onbekend. U kunt een andere\n" -"tekenset kiezen om te vervangen of kies [Annuleer]\n" +"tekenset kiezen om te vervangen of kies [Annuleren]\n" "als het niet vervangen kan worden" #: ../src/msw/ole/dataobj.cpp:367 diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 4410a3deab..24482f301f 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -2058,7 +2058,7 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) #endif , s_windowFocus->GetName().c_str() #ifdef __WXMSW__ - , (unsigned int) s_windowFocus->GetHWND() + , (unsigned)wxPtrToUInt(s_windowFocus->GetHWND()) #endif ); } diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index d5a268e6cb..f4a0a5319c 100644 --- a/samples/listctrl/listtest.cpp +++ b/samples/listctrl/listtest.cpp @@ -1305,9 +1305,9 @@ void MyListCtrl::OnRightClick(wxMouseEvent& event) void MyListCtrl::LogEvent(const wxListEvent& event, const wxChar *eventName) { - wxLogMessage(wxT("Item %ld: %s (item text = %s, data = %ld)"), + wxLogMessage(wxT("Item %d: %s (item text = %s, data = %ld)"), event.GetIndex(), eventName, - event.GetText().c_str(), event.GetData()); + event.GetText(), static_cast(event.GetData())); } wxString MyListCtrl::OnGetItemText(long item, long column) const diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp index a4c059cff5..fdf102314a 100644 --- a/samples/popup/popup.cpp +++ b/samples/popup/popup.cpp @@ -171,42 +171,42 @@ SimpleTransientPopup::~SimpleTransientPopup() void SimpleTransientPopup::Popup(wxWindow* WXUNUSED(focus)) { - wxLogMessage( wxT("0x%lx SimpleTransientPopup::Popup"), long(this) ); + wxLogMessage( "%p SimpleTransientPopup::Popup", this ); wxPopupTransientWindow::Popup(); } void SimpleTransientPopup::OnDismiss() { - wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnDismiss"), long(this) ); + wxLogMessage( "%p SimpleTransientPopup::OnDismiss", this ); wxPopupTransientWindow::OnDismiss(); } bool SimpleTransientPopup::ProcessLeftDown(wxMouseEvent& event) { - wxLogMessage( wxT("0x%lx SimpleTransientPopup::ProcessLeftDown pos(%d, %d)"), long(this), event.GetX(), event.GetY()); + wxLogMessage( "%p SimpleTransientPopup::ProcessLeftDown pos(%d, %d)", this, event.GetX(), event.GetY()); return wxPopupTransientWindow::ProcessLeftDown(event); } bool SimpleTransientPopup::Show( bool show ) { - wxLogMessage( wxT("0x%lx SimpleTransientPopup::Show %d"), long(this), int(show)); + wxLogMessage( "%p SimpleTransientPopup::Show %d", this, int(show)); return wxPopupTransientWindow::Show(show); } void SimpleTransientPopup::OnSize(wxSizeEvent &event) { - wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnSize"), long(this) ); + wxLogMessage( "%p SimpleTransientPopup::OnSize", this ); event.Skip(); } void SimpleTransientPopup::OnSetFocus(wxFocusEvent &event) { - wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnSetFocus"), long(this) ); + wxLogMessage( "%p SimpleTransientPopup::OnSetFocus", this ); event.Skip(); } void SimpleTransientPopup::OnKillFocus(wxFocusEvent &event) { - wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnKillFocus"), long(this) ); + wxLogMessage( "%p SimpleTransientPopup::OnKillFocus", this ); event.Skip(); } @@ -220,8 +220,8 @@ void SimpleTransientPopup::OnMouse(wxMouseEvent &event) if (rect.Contains(event.GetPosition())) { colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnMouse pos(%d, %d)"), - long(event.GetEventObject()), event.GetX(), event.GetY()); + wxLogMessage( "%p SimpleTransientPopup::OnMouse pos(%d, %d)", + event.GetEventObject(), event.GetX(), event.GetY()); } if (colour != m_mouseText->GetBackgroundColour()) @@ -234,7 +234,7 @@ void SimpleTransientPopup::OnMouse(wxMouseEvent &event) void SimpleTransientPopup::OnButton(wxCommandEvent& event) { - wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnButton ID %d"), long(this), event.GetId()); + wxLogMessage( "%p SimpleTransientPopup::OnButton ID %d", this, event.GetId()); wxButton *button = wxDynamicCast(event.GetEventObject(), wxButton); if (button->GetLabel() == wxT("Press Me")) @@ -247,8 +247,8 @@ void SimpleTransientPopup::OnButton(wxCommandEvent& event) void SimpleTransientPopup::OnSpinCtrl(wxSpinEvent& event) { - wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnSpinCtrl ID %d Value %d"), - long(this), event.GetId(), event.GetInt()); + wxLogMessage( "%p SimpleTransientPopup::OnSpinCtrl ID %d Value %d", + this, event.GetId(), event.GetInt()); event.Skip(); } @@ -412,7 +412,7 @@ void MyFrame::OnStartSimplePopup(wxCommandEvent& event) wxPoint pos = btn->ClientToScreen( wxPoint(0,0) ); wxSize sz = btn->GetSize(); m_simplePopup->Position( pos, sz ); - wxLogMessage( wxT("0x%lx Simple Popup Shown pos(%d, %d) size(%d, %d)"), long(m_simplePopup), pos.x, pos.y, sz.x, sz.y ); + wxLogMessage( "%p Simple Popup Shown pos(%d, %d) size(%d, %d)", m_simplePopup, pos.x, pos.y, sz.x, sz.y ); m_simplePopup->Popup(); } @@ -425,7 +425,7 @@ void MyFrame::OnStartScrolledPopup(wxCommandEvent& event) wxPoint pos = btn->ClientToScreen( wxPoint(0,0) ); wxSize sz = btn->GetSize(); m_scrolledPopup->Position( pos, sz ); - wxLogMessage( wxT("0x%lx Scrolled Popup Shown pos(%d, %d) size(%d, %d)"), long(m_scrolledPopup), pos.x, pos.y, sz.x, sz.y ); + wxLogMessage( "%p Scrolled Popup Shown pos(%d, %d) size(%d, %d)", m_scrolledPopup, pos.x, pos.y, sz.x, sz.y ); m_scrolledPopup->Popup(); } @@ -488,7 +488,7 @@ void MyDialog::OnStartSimplePopup(wxCommandEvent& event) wxPoint pos = btn->ClientToScreen( wxPoint(0,0) ); wxSize sz = btn->GetSize(); m_simplePopup->Position( pos, sz ); - wxLogMessage( wxT("0x%lx Dialog Simple Popup Shown pos(%d, %d) size(%d, %d)"), long(m_simplePopup), pos.x, pos.y, sz.x, sz.y ); + wxLogMessage( "%p Dialog Simple Popup Shown pos(%d, %d) size(%d, %d)", m_simplePopup, pos.x, pos.y, sz.x, sz.y ); m_simplePopup->Popup(); } @@ -501,6 +501,6 @@ void MyDialog::OnStartScrolledPopup(wxCommandEvent& event) wxPoint pos = btn->ClientToScreen( wxPoint(0,0) ); wxSize sz = btn->GetSize(); m_scrolledPopup->Position( pos, sz ); - wxLogMessage( wxT("0x%lx Dialog Scrolled Popup Shown pos(%d, %d) size(%d, %d)"), long(m_scrolledPopup), pos.x, pos.y, sz.x, sz.y ); + wxLogMessage( "%p Dialog Scrolled Popup Shown pos(%d, %d) size(%d, %d)", m_scrolledPopup, pos.x, pos.y, sz.x, sz.y ); m_scrolledPopup->Popup(); } diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index df7ecdff59..3f73371484 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -517,7 +517,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent) void wxDialogBase::ShowWindowModal () { - ShowModal(); + int retval = ShowModal(); + // wxWindowModalDialogEvent relies on GetReturnCode() returning correct + // code. Rather than doing it manually in all ShowModal() overrides for + // native dialogs (and getting accidentally broken again), set it here. + // The worst that can happen is that it will be set twice to the same + // value. + SetReturnCode(retval); SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED ); } diff --git a/src/common/filename.cpp b/src/common/filename.cpp index d538ebcc38..6acde7603c 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -315,14 +315,20 @@ static bool IsUNCPath(const wxString& path, wxPathFormat format) !IsDOSPathSep(path[2u]); } -#ifndef __WIN32__ +// Under Unix-ish systems (basically everything except Windows but we can't +// just test for non-__WIN32__ because Cygwin defines it, yet we want to use +// lstat() under it, so test for all the rest explicitly) we may work either +// with the file itself or its target if it's a symbolic link and we should +// dereference it, as determined by wxFileName::ShouldFollowLink() and the +// absence of the wxFILE_EXISTS_NO_FOLLOW flag. StatAny() can be used to stat +// the appropriate file with an extra twist that it also works when there is no +// wxFileName object at all, as is the case in static methods. -// Under Unix-ish systems (basically everything except Windows) we may work -// either with the file itself or its target if it's a symbolic link and we -// should dereference it, as determined by wxFileName::ShouldFollowLink() and -// the absence of the wxFILE_EXISTS_NO_FOLLOW flag. StatAny() can be used to -// stat the appropriate file with an extra twist that it also works when there -// is no wxFileName object at all, as is the case in static methods. +#if defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__)) + #define wxHAVE_LSTAT +#endif + +#ifdef wxHAVE_LSTAT // Private implementation, don't call directly, use one of the overloads below. bool DoStatAny(wxStructStat& st, wxString path, bool dereference) @@ -363,7 +369,7 @@ bool StatAny(wxStructStat& st, const wxFileName& fn) return DoStatAny(st, fn.GetFullPath(), fn.ShouldFollowLink()); } -#endif // !__WIN32__ +#endif // wxHAVE_LSTAT // ---------------------------------------------------------------------------- // private constants @@ -1851,7 +1857,7 @@ bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const if ( fn1.GetFullPath() == fn2.GetFullPath() ) return true; -#if defined(__UNIX__) +#ifdef wxHAVE_LSTAT wxStructStat st1, st2; if ( StatAny(st1, fn1) && StatAny(st2, fn2) ) { @@ -1859,7 +1865,7 @@ bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const return true; } //else: It's not an error if one or both files don't exist. -#endif // defined __UNIX__ +#endif // wxHAVE_LSTAT return false; } @@ -2752,7 +2758,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, return true; } -#elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__)) +#elif defined(wxHAVE_LSTAT) // no need to test for IsDir() here wxStructStat stBuf; if ( StatAny(stBuf, *this) ) diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 2928d1dd80..4938977b10 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -333,7 +333,7 @@ void wxColourDatabase::Initialize() {wxT("LIGHT GREY"), 192, 192, 192}, {wxT("LIGHT STEEL BLUE"), 143, 143, 188}, {wxT("LIME GREEN"), 50, 204, 50}, - {wxT("LIGHT MAGENTA"), 255, 0, 255}, + {wxT("LIGHT MAGENTA"), 255, 119, 255}, {wxT("MAGENTA"), 255, 0, 255}, {wxT("MAROON"), 142, 35, 107}, {wxT("MEDIUM AQUAMARINE"), 50, 204, 153}, diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp index dad7778b0a..26ac4df2a3 100644 --- a/src/common/xlocale.cpp +++ b/src/common/xlocale.cpp @@ -76,7 +76,9 @@ wxXLocale& wxXLocale::GetCLocale() { if ( !gs_cLocale ) { - wxXLocaleCTag* tag = NULL; + // Notice that we need a separate variable because clang 3.1 refuses to + // cast nullptr (which is how NULL is defined in it) to anything. + static wxXLocaleCTag* const tag = NULL; gs_cLocale = new wxXLocale(tag); } diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index d36e86116b..6b4bf50e75 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -4454,7 +4454,7 @@ void wxDataViewMainWindow::OnColumnsCountChanged() editableCount++; } - m_useCellFocus = (editableCount > 1); + m_useCellFocus = (editableCount > 0); UpdateDisplay(); } diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 58a5c733eb..31c7478798 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -3496,6 +3496,12 @@ size_t wxListMainWindow::GetItemCount() const void wxListMainWindow::SetItemCount(long count) { + // Update the current item if it's not valid any longer (notice that this + // invalidates it completely if the control is becoming empty, which is the + // right thing to do). + if ( HasCurrent() && m_current >= (size_t)count ) + ChangeCurrent(count - 1); + m_selStore.SetItemCount(count); m_countVirt = count; diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 9413b34f73..73bff5b586 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -4263,6 +4263,7 @@ wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wx return; wxDataViewEvent event( wxEVT_DATAVIEW_SELECTION_CHANGED, dv->GetId() ); + event.SetEventObject( dv ); event.SetItem( dv->GetSelection() ); event.SetModel( dv->GetModel() ); dv->HandleWindowEvent( event ); diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index cb0885892e..24f187036f 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -674,4 +674,22 @@ wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const return tsize; } +wxWindow *wxComboBox::MSWFindItem(long id, WXHWND hWnd) const +{ + // The base class version considers that any window with the same ID as + // this one must be this window itself, but this is not the case for the + // comboboxes where the native control seems to always use the ID of 1000 + // for the popup listbox that it creates -- and this ID may be the same as + // our own one. So we must explicitly check the HWND value too here and + // avoid eating the events from the listbox as otherwise it is rendered + // inoperative, see #15647. + if ( id == GetId() && hWnd != GetHWND() ) + { + // Must be the case described above. + return NULL; + } + + return wxChoice::MSWFindItem(id, hWnd); +} + #endif // wxUSE_COMBOBOX diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 1fe94bab92..4bb6ae8423 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -442,6 +442,15 @@ WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC) GetHWND()); } +wxWindow* wxControl::MSWFindItem(long id, WXHWND hWnd) const +{ + // is it us or one of our "internal" children? + if ( id == GetId() || (GetSubcontrols().Index(id) != wxNOT_FOUND) ) + return const_cast(this); + + return wxControlBase::MSWFindItem(id, hWnd); +} + // ---------------------------------------------------------------------------- // wxControlWithItems // ---------------------------------------------------------------------------- diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 779e750e0c..97a4da07fc 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -148,7 +148,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst, #endif // wxHAS_RAW_BITMAP -namespace wxMSW +namespace wxMSWImpl { // Wrappers for the dynamically loaded {Set,Get}Layout() functions. They work @@ -162,7 +162,7 @@ DWORD SetLayout(HDC hdc, DWORD dwLayout); // temporary compatible memory DC to the real target DC) using the same layout. HDC CreateCompatibleDCWithLayout(HDC hdc); -} // namespace wxMSW +} // namespace wxMSWImpl // ---------------------------------------------------------------------------- // private classes @@ -1341,7 +1341,7 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool #endif // wxUSE_SYSTEM_OPTIONS { HDC cdc = GetHdc(); - HDC hdcMem = wxMSW::CreateCompatibleDCWithLayout(cdc); + HDC hdcMem = wxMSWImpl::CreateCompatibleDCWithLayout(cdc); HGDIOBJ hOldBitmap = ::SelectObject(hdcMem, GetHbitmapOf(bmp)); #if wxUSE_PALETTE wxPalette *pal = bmp.GetPalette(); @@ -1382,7 +1382,7 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool else // no mask, just use BitBlt() { HDC cdc = GetHdc(); - HDC memdc = wxMSW::CreateCompatibleDCWithLayout( cdc ); + HDC memdc = wxMSWImpl::CreateCompatibleDCWithLayout( cdc ); HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( ); wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") ); @@ -2281,8 +2281,8 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest, buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap; #else // !wxUSE_DC_CACHEING // create a temp buffer bitmap and DCs to access it and the mask - dc_mask = wxMSW::CreateCompatibleDCWithLayout(hdcSrc); - dc_buffer = wxMSW::CreateCompatibleDCWithLayout(GetHdc()); + dc_mask = wxMSWImpl::CreateCompatibleDCWithLayout(hdcSrc); + dc_buffer = wxMSWImpl::CreateCompatibleDCWithLayout(GetHdc()); buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight); #endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING HGDIOBJ hOldMaskBitmap = ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap()); @@ -2595,7 +2595,7 @@ wxDCCacheEntry* wxMSWDCImpl::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc) node = node->GetNext(); } - WXHDC hDC = (WXHDC) wxMSW::CreateCompatibleDCWithLayout((HDC) dc); + WXHDC hDC = (WXHDC) wxMSWImpl::CreateCompatibleDCWithLayout((HDC) dc); if ( !hDC) { wxLogLastError(wxT("CreateCompatibleDC")); @@ -2827,7 +2827,7 @@ void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect, #if wxUSE_DYNLIB_CLASS -namespace wxMSW +namespace wxMSWImpl { DWORD GetLayout(HDC hdc) @@ -2853,19 +2853,19 @@ HDC CreateCompatibleDCWithLayout(HDC hdc) HDC hdcNew = ::CreateCompatibleDC(hdc); if ( hdcNew ) { - DWORD dwLayout = wxMSW::GetLayout(hdc); + DWORD dwLayout = wxMSWImpl::GetLayout(hdc); if ( dwLayout != GDI_ERROR ) - wxMSW::SetLayout(hdcNew, dwLayout); + wxMSWImpl::SetLayout(hdcNew, dwLayout); } return hdcNew; } -} // namespace wxMSW +} // namespace wxMSWImpl wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const { - DWORD layout = wxMSW::GetLayout(GetHdc()); + DWORD layout = wxMSWImpl::GetLayout(GetHdc()); if ( layout == GDI_ERROR ) return wxLayout_Default; @@ -2882,7 +2882,7 @@ void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir) return; } - DWORD layout = wxMSW::GetLayout(GetHdc()); + DWORD layout = wxMSWImpl::GetLayout(GetHdc()); if ( layout == GDI_ERROR ) return; @@ -2891,13 +2891,13 @@ void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir) else layout &= ~LAYOUT_RTL; - wxMSW::SetLayout(GetHdc(), layout); + wxMSWImpl::SetLayout(GetHdc(), layout); } #else // !wxUSE_DYNLIB_CLASS // Provide stubs to avoid ifdefs in the code using these functions. -namespace wxMSW +namespace wxMSWImpl { DWORD GetLayout(HDC WXUNUSED(hdc)) @@ -2915,7 +2915,7 @@ HDC CreateCompatibleDCWithLayout(HDC hdc) return ::CreateCompatibleDC(hdc); } -} // namespace wxMSW +} // namespace wxMSWImpl // we can't provide RTL support without dynamic loading, so stub it out wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp index e44ca16d1a..02da8a94d8 100644 --- a/src/msw/msgdlg.cpp +++ b/src/msw/msgdlg.cpp @@ -586,9 +586,7 @@ int wxMessageDialog::ShowMessageBox() // do show the dialog int msAns = MessageBox(hWnd, message.t_str(), m_caption.t_str(), msStyle); - int ret = MSWTranslateReturnCode(msAns); - SetReturnCode(ret); - return ret; + return MSWTranslateReturnCode(msAns); } int wxMessageDialog::ShowModal() @@ -623,9 +621,7 @@ int wxMessageDialog::ShowModal() msAns = IDOK; } - int ret = MSWTranslateReturnCode(msAns); - SetReturnCode(ret); - return ret; + return MSWTranslateReturnCode( msAns ); } #endif // wxHAS_MSW_TASKDIALOG diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index de04f2084f..1eb8b24acd 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -110,24 +110,20 @@ wxSize wxStaticText::DoGetBestClientSize() const widthTextMax += 2; #endif // __WXWINCE__ - // It looks like the static control needs "slightly" more vertical space - // than the character height and while the text isn't actually truncated if - // we use just the minimal height, it is positioned differently than when - // the control has enough space and this result in the text in edit and - // static controls not being aligned when the controls themselves are. As - // this is something you really should be able to count on, increase the - // space allocated for the control so that the base lines do align - // correctly. Notice that while the above is true at least for the single - // line controls, there doesn't seem to do any harm to allocate two extra - // pixels in multi-line case neither so do it always for consistency. + // This extra pixel is a hack we use to ensure that a wxStaticText + // vertically centered around the same position as a wxTextCtrl shows its + // text on exactly the same baseline. It is not clear why is this needed + // nor even whether this works in all cases, but it does work, at least + // with the default fonts, under Windows XP, 7 and 8, so just use it for + // now. // - // I still have no idea why exactly is this needed nor why should we use 2 - // and not something else. This seems to work in all the configurations - // though (small/large fonts, different OS versions, ...) so just hard code - // it for now. If we need something better later it might be worth looking - // at the height of the text control returned by ::GetComboBoxInfo() as it - // seems to be the "minimal acceptable" height. - heightTextTotal += 2; + // In the future we really ought to provide a way for each of the controls + // to provide information about the position of the baseline for the text + // it shows and use this information in the sizer code when centering the + // controls vertically, otherwise we simply can't ensure that the text is + // always on the same line, e.g. even with this hack wxComboBox text is + // still not aligned to the same position. + heightTextTotal += 1; return wxSize(widthTextMax, heightTextTotal); } diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 5eb38a2fc9..82c7649972 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -51,7 +51,6 @@ #endif #if defined(__GNUWIN32__) - #include #include #endif diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 1f0f700a68..225e13d531 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -365,30 +365,21 @@ END_EVENT_TABLE() // --------------------------------------------------------------------------- // Find an item given the MS Windows id -wxWindow *wxWindowMSW::FindItem(long id) const +wxWindow *wxWindowMSW::FindItem(long id, WXHWND hWnd) const { -#if wxUSE_CONTROLS - wxControl *item = wxDynamicCastThis(wxControl); - if ( item ) - { - // is it us or one of our "internal" children? - if ( item->GetId() == id -#ifndef __WXUNIVERSAL__ - || (item->GetSubcontrols().Index(id) != wxNOT_FOUND) -#endif // __WXUNIVERSAL__ - ) - { - return item; - } - } -#endif // wxUSE_CONTROLS + // First check for the control itself and its Windows-level children which + // are mapped to the same wxWindow at wx level. + wxWindow *wnd = MSWFindItem(id, hWnd); + if ( wnd ) + return wnd; + // Then check wx level children. wxWindowList::compatibility_iterator current = GetChildren().GetFirst(); while (current) { wxWindow *childWin = current->GetData(); - wxWindow *wnd = childWin->FindItem(id); + wnd = childWin->FindItem(id, hWnd); if ( wnd ) return wnd; @@ -675,7 +666,8 @@ wxWindowMSW::MSWShowWithEffect(bool show, unsigned timeout) { #if wxUSE_DYNLIB_CLASS - if ( effect == wxSHOW_EFFECT_NONE ) + if ( effect == wxSHOW_EFFECT_NONE || + (GetParent() && !GetParent()->IsShownOnScreen()) ) return Show(show); if ( !wxWindowBase::Show(show) ) @@ -5323,7 +5315,7 @@ bool wxWindowMSW::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control) // try the id if ( !win ) { - win = FindItem(id); + win = FindItem(id, control); } if ( win ) diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm index 0cc450997e..95d36c388e 100644 --- a/src/osx/cocoa/listbox.mm +++ b/src/osx/cocoa/listbox.mm @@ -302,8 +302,6 @@ protected: wxListBox *list = static_cast ( impl->GetWXPeer()); wxCHECK_RET( list != NULL , wxT("Listbox expected")); - wxCommandEvent event( wxEVT_LISTBOX, list->GetId() ); - if ((row < 0) || (row > (int) list->GetCount())) // OS X can select an item below the last item return; diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm index ebca4f42e1..701f3f45b5 100644 --- a/src/osx/cocoa/toolbar.mm +++ b/src/osx/cocoa/toolbar.mm @@ -254,7 +254,6 @@ public: #endif // wxOSX_USE_NATIVE_TOOLBAR private: -#if wxOSX_USE_NATIVE_TOOLBAR wxFontEncoding GetToolBarFontEncoding() const { wxFont f; @@ -262,7 +261,6 @@ private: f = GetToolBar()->GetFont(); return f.IsOk() ? f.GetEncoding() : wxFont::GetDefaultEncoding(); } -#endif // wxOSX_USE_NATIVE_TOOLBAR void Init() { @@ -689,9 +687,11 @@ wxToolBar::~wxToolBar() frame->SetToolBar(NULL); } +#if wxOSX_USE_NATIVE_TOOLBAR [(NSToolbar*)m_macToolbar setDelegate:nil]; [(NSToolbar*)m_macToolbar release]; m_macToolbar = NULL; +#endif // wxOSX_USE_NATIVE_TOOLBAR } bool wxToolBar::Show( bool show ) diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp index dcfc0e15b4..08346e5adb 100644 --- a/src/osx/textctrl_osx.cpp +++ b/src/osx/textctrl_osx.cpp @@ -599,21 +599,6 @@ bool wxTextCtrl::MacSetupCursor( const wxPoint& pt ) return true ; } -bool wxTextCtrl::SetHint(const wxString& hint) -{ - m_hintString = hint; - - if ( GetTextPeer() && GetTextPeer()->SetHint(hint) ) - return true; - - return false; -} - -wxString wxTextCtrl::GetHint() const -{ - return m_hintString; -} - // ---------------------------------------------------------------------------- // implementation base class // ---------------------------------------------------------------------------- diff --git a/src/osx/textentry_osx.cpp b/src/osx/textentry_osx.cpp index 67a858ea8f..8a1466ba83 100644 --- a/src/osx/textentry_osx.cpp +++ b/src/osx/textentry_osx.cpp @@ -287,6 +287,18 @@ wxTextWidgetImpl * wxTextEntry::GetTextPeer() const return win ? dynamic_cast(win->GetPeer()) : NULL; } +bool wxTextEntry::SetHint(const wxString& hint) +{ + m_hintString = hint; + return GetTextPeer() && GetTextPeer()->SetHint(hint); +} + +wxString wxTextEntry::GetHint() const +{ + return m_hintString; +} + + // ---------------------------------------------------------------------------- // Auto-completion // ---------------------------------------------------------------------------- diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 63b5099321..7e6628c825 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -1297,8 +1297,10 @@ void wxPropertyGrid::CalculateFontAndBitmapStuff( int vspacing ) void wxPropertyGrid::OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) { - RegainColours(); - Refresh(); + if ((m_iFlags & wxPG_FL_INITIALIZED)!=0) { + RegainColours(); + Refresh(); + } } // ----------------------------------------------------------------------- diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index b752c39689..393c3842e4 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -537,15 +537,12 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, XYPOSITION * } ui++; } -#else - +#else // !wxUSE_UNICODE // If not unicode then just use the widths we have -#if wxUSE_STD_CONTAINERS - std::copy(tpos.begin(), tpos.end(), positions); -#else - memcpy(positions, tpos.begin(), len * sizeof(int)); -#endif -#endif + for (int i = 0; i < len; i++) { + positions[i] = tpos[i]; + } +#endif // wxUSE_UNICODE/!wxUSE_UNICODE } diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index b0efa231f6..bbee40053e 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -870,10 +870,10 @@ bool wxTextCtrl::ReplaceLine(wxTextCoord line, // now change the line MData().m_lines[line] = text; - // OPT: we choose to lay it our immediately instead of delaying it + // OPT: we choose to lay it out immediately instead of delaying it // until it is needed because it allows us to avoid invalidating - // lines further down if the number of rows didn't chnage, but - // maybe we can imporve this even further? + // lines further down if the number of rows didn't change, but + // maybe we can improve this even further? LayoutLine(line, lineData); int rowsNew = lineData.GetExtraRowCount();