Commit Graph

18 Commits

Author SHA1 Message Date
Miguel A. Colón Vélez 9565aaf469 Backport wx30 fix for VS2015.
This is commit f350babf36818ba805ab0b4510b6616aaf3063fc.
.
Reading "Please update wx/compiler.h to recognize this VC++ version" gets
old pretty quickly.
2015-08-22 10:30:11 -04:00
Miguel A. Colón Vélez a1de0614d7 Remove vs2012 files.
It does not support several things from C99/C++11 that are
used in the project.
2015-08-18 01:15:51 -04:00
Miguel A. Colón Vélez a1e56518a5 Rename inside the files. 2015-08-18 00:44:49 -04:00
Miguel A. Colón Vélez 277217353e Rename files. 2015-08-18 00:44:35 -04:00
Miguel A. Colón Vélez 1fe5aceded Enable round-tripping.
- Remove ToolsVersion
- Use $(DefaultPlatformToolset)_xp until XP support is dropped.
Note: opencl had no XP support and was not enabled in VS2012.
2015-08-18 00:44:19 -04:00
Miguel A. Colón Vélez f52988b93c Run devenv /upgrade
This ensures the solution can do round-tripping.
2015-08-18 00:44:02 -04:00
Jonathan Li 2ea51dd594 Fix wxCore30's rcdefs.h pathname
Visual Studio flags wxCore30 as being out of date because it can't find
the rcdefs.h header file. Use the arch dependent pathname so it is
located correctly.
2015-08-05 22:59:00 +01:00
Miguel A. Colón Vélez 6462393aaf Introduce end-of-line normalization
Signed-off-by: Gregory Hainaut <gregory.hainaut@gmail.com>
2015-08-04 23:52:48 +02:00
Jonathan Li f5f3bc4e60 wxWidgets3.0: Always include correct manifest
If pcsx2 is compiled for 32-bits and then compiled for 64-bits without
cleaning the build files, the wrong wx3.0 manifest will be included. The
same will happen vice versa.

Place the generated rcdefs.h file in a platform specific directory so
the correct manifest will always be used.
2015-07-25 17:29:59 +01:00
Jonathan Li 8879866b32 wxWidgets3.0: use relative paths for wxConfig30
This lets wxWidgets3.0 build even when the full pathname has non ASCII
characters or spaces in it.

Note that pcsx2 and some of the plugins that rely on custom build
commands still fail.
2015-07-25 00:33:37 +01:00
Jonathan Li 1da4232138 Fix wxWidgets3.0 and libpng build file pathnames
This puts the wxWidgets3.0 and libpng generated library files into the
deps folder, and puts the other builds files in a subdirectory from
where the project files are located. This is consistent with all the
other 3rdparty projects.

The output libraries for Devel builds are also suffixed with -dev
instead of -dbg now.
2015-07-17 23:12:40 +01:00
Jonathan Li db6a32ac33 windows: switch to wxWidgets 3.0
This replaces wxWidgets 2.8 with wxWidgets 3.0 plus all the necessary
include/referencing to get PCSX2 to compile.

VS2012 change is untested.
2015-07-13 21:19:12 +01:00
Jonathan Li bb4a155c73 configure wxWidgets 3.0, update .gitignore
Configures the settings in include/wx/msw/setup.h.
Removes icons from include/wx/msw/wx.rc.
Deletes include/wx/msw/rcdefs.h (autogenerated by build process).

Updates .gitignore by including wxWidgets3.0 build files and adds a
missing '/' to build.
2015-07-03 10:05:59 +01:00
Jonathan Li c3755b82a4 wxWidgets3.0: setup VS2012 project files
Same as previous commit, but with VS2012 and no extra property sheet.
2015-07-03 10:05:59 +01:00
Jonathan Li 1bada25a79 wxWidgets3.0: setup VS2013 project files
This configure the VS2013 files so that the now external libpng and
libjpeg libraries are used, and to place some of the common stuff into a
property sheet.

For deleted files, I've chosen to exclude from build instead of removing
them from the project file. It's less work to re-add them if they're
required at a later stage.
2015-07-03 10:05:58 +01:00
Jonathan Li f1547c14e0 wxWidgets3.0: rename Visual Studio project files
This renames the project files for consistency with the names of the
other project files.
2015-07-03 10:05:56 +01:00
Jonathan Li 9a9e93da83 wxWidgets3.0: upgrade from 3.0.1 to 3.0.2 2015-07-03 10:05:56 +01:00
Jonathan Li 24d5e59c32 wxWidgets3.0: trim files and rename directory
Delete files and directories that won't be used, and rename the
wxWidgets 3.0 directory to reduce confusion when doing maintenance
version upgrades.
2015-07-03 10:05:55 +01:00