Commit Graph

77 Commits

Author SHA1 Message Date
orbea be3b25a750 Set wxUSE_XLOCALE to 0 2017-08-24 12:56:18 -07:00
Shawn Hoffman 397720a9fe might as well update yet some more pointless version numbers.. 2017-06-03 18:20:40 -07:00
Shawn Hoffman e8e2f329fb wxw: clean up vcxproj a bit 2017-06-03 18:20:40 -07:00
Shawn Hoffman 80642a944d wxw[msw]: disable wxUSE_DBGHELP (issue 7591) 2017-06-03 18:20:40 -07:00
BhaaL 072c161445 upgrade to Windows SDK 10.0.15063.0
this is required for /permissive- to work, because some headers in the
Windows SDK use Microsoft extensions that are not allowed in standards mode
2017-05-28 13:37:31 +02:00
Pierre Bourdon d592bdd4d4 Migrate to Visual Studio 2017.
Auto-generated by the IDE, I'll trust it knows what it's doing.
2017-05-25 15:58:59 -07:00
Michael Maltese 6e1940c404 CMake: don't globally include wxWidgets headers 2017-04-25 17:18:20 -07:00
Michael Maltese f4c0723387 CMake: move wxWidgets check_lib code into wxWidgets 2017-04-25 17:18:20 -07:00
Michael Maltese 6197d9622f CMake: move GTK+ check into wxWidgets 2017-04-25 17:18:20 -07:00
Michael Maltese 8e7648f42a CMake: modern-ize wxWidgets 2017-04-25 17:18:18 -07:00
Florent Castelli 5984ca26f3 wx: Move platform defines to wx setup header
Usually, this is passed as a preprocessor definition, but this is error
prone and just complicating the compiler invocation for no good reason.
2017-02-06 04:27:06 +01:00
Markus Wick eed64bb0fe Merge pull request #4744 from ligfx/cleanup-osx-cmake
CMake: Cleanup macOS-related logic
2017-01-24 14:36:10 +01:00
Michael Maltese 4cbd07b81f CMake: remove unneeded macOS frameworks 2017-01-24 01:27:41 -08:00
Florent Castelli 7fe8395c33 cmake: Move listctrl in wxWidgts to platform specific generic 2017-01-24 03:22:03 +01:00
Florent Castelli fa04c1479e cmake: Remove PCH support
Compilers are very picky and don't use PCH when they have been compiled
with different flags. I even got some ICE in MSVC, so removing them for now.

Modules are the solution.
2017-01-24 03:22:03 +01:00
Florent Castelli c3e876b6be cmake: Fix building wxWidgets on Windows
And disable unused network functions.
2017-01-21 03:25:58 +01:00
Lioncash 65a8b999b4 wxWidgets (gtk): Patch that allows label switching to work for wxToolBar
This applies a patch that was merged into the mainline wxWidgets tree to
support label changing with wxToolBar. This originally only worked on
Windows and macOS, which is kind of annoying.

This is beneficial because it means that a tool doesn't have to be removed
and then reinserted into a wxToolBar instance in order to change the
label.

For more details, see ticket #17567 on the wxWidgets issue tracker.
2016-10-29 02:49:45 -04:00
Vincent Duvert 671fdb8acf wxWidgets: Fix build on case-sensitive macOS
On macOS, wxWidget’s tooltip.mm tries to include a system header with an improper capitalization (Appkit instead of AppKit), which causes the build to fail if the system headers are located on a case-sensitive filesystem.
2016-10-16 11:42:41 +02:00
EmptyChaos 9df8388900 WXMSW-Patch: Fix wxTipWindow internal assertion failure. 2016-10-04 13:47:21 +11:00
shuffle2 09fd2fd8e2 Merge pull request #4015 from EmptyChaos/wx-misc-fixes
WX: Fix pop-under (win) / game list garbage (win) / language support (Linux)
2016-10-02 22:46:14 -07:00
Léo Lam e8cb4119b8 Drop Dolphin-specific patch to wxWindows
This removes a Dolphin-specific patch to the wxWidgets3 code
for the following reasons:

* Calling wxWindowGTK::DoSetSize on a top-level window can end up
  calling wxTopLevelWindowGTK::DoMoveWindow, which triggers an assert
  because it is not supposed to be called for a top-level wxWindow.

* We should not be patching the wxWidgets code because that means the
  toolbars will still be broken if someone builds without using the
  WX that is in our Externals.

Instead, we now use a derived class for wxAuiToolBar and override
DoSetSize() to remove the problematic behaviour to get the same effect
(fixing toolbars) but without changing Externals code and without
causing asserts and other issues.
2016-09-07 15:15:09 +02:00
EmptyChaos 50756d69c0 WX: Various fixes.
Dolphin no longer lowers itself below the top window when opening.
Dolphin no longer draws garbage lines all over the game list.

Use the correct platform macros so Dolphin can actually find the
translation catalogs on Unix.
2016-08-31 14:32:39 +10:00
EmptyChaos 822326eea9 Update wxWidgets to 3.1.0
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7.

include/wx/defs.h -- __w64 warning disable patch by comex brought forward.

include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code.

src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux.

src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue.

src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text).

Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
2016-06-26 15:25:29 +10:00
Pierre Bourdon c4f5c471bb Externals: Add libcurl. 2016-06-18 18:31:40 +02:00
Shawn Hoffman 92e9a84685 [windows/wxw] Exclude files which don't publish any symbols. 2015-09-03 04:39:04 -07:00
Shawn Hoffman dfc1f0a87e Patch wxw to compile on vs2015. 2015-09-03 04:38:58 -07:00
Shawn Hoffman aa7208e270 [windows] Update projects to vs2015. 2015-09-03 04:23:01 -07:00
Shawn Hoffman ad64336137 quiet some warnings which appear on vs2015.
quieted warnings include shadowed variable names and integer extensions.
2015-03-15 19:28:47 -07:00
Shawn Hoffman 25064fd8f4 remove win32/mixed project configurations.
remove win32 configs from all the externals, so it shouldn't happen again by accident.
2015-03-14 14:07:21 -07:00
Tillmann Karras 6bcdb10eee CMake: simplify some expressions 2015-01-03 13:17:57 +01:00
Rohit Nirmal 6bd7b1a42a Compile external WX with C++11 if Linux.
Fixes PR #1545.
2014-11-17 22:58:29 +00:00
Rohit Nirmal 12b7600ae7 Explicitly compile external WX in C++11 mode.
Apparently an update to gcc now requires this.
2014-11-15 21:41:41 -06:00
Chris Ballinger ffe976659e Fix OpenGL linker error on OS X 2014-10-22 00:34:31 -07:00
Shawn Hoffman 266992684d msvc: remove some remnants of SDL and DSound from projects and general cleanup. 2014-09-01 21:27:44 -07:00
comex 3ee1e5cbf0 Switch from disabling a laundry list of warnings for wxWidgets to just disabling everything, since they're almost certainly not our problem and I want to compile with -Werror. 2014-08-23 15:21:28 -04:00
Shawn Hoffman 317e63e7ba msvc: disable compiler warnings when building all Externals (cl /W0), except for wxWidgets, where all warnings are fixed.
Note warnings may still be generated by code in Externals if it is included into warning-enabled code (this is the case for libusb).
Also, quiet an intellisense warning in wxWidgets caused by using __w64 for an inapplicable type.
2014-08-19 22:33:42 -07:00
Shawn Hoffman f1b82a34b2 Windows: Use a shared precompiled header for dolphin code under Source/ 2014-08-14 23:51:13 -07:00
Ryan Houdek 95ab2380c9 [GLExtensions] wxWidgets expects to statically link in to GL 1.1 functions like any sane project. Let them do this. 2014-01-17 16:05:47 +01:00
Jasper St. Pierre 43e618682e Convert all vcxproj files to UNIX line endings 2013-12-31 14:03:18 -05:00
comex 1334d7fc41 Update wx to r75363 to address a wx bug that was breaking netplay on OS X. 2013-12-08 15:37:10 -05:00
Ryan Houdek 3e6e997e8b Fix OS X wxWidgets complaining. 2013-11-15 01:15:44 +00:00
Shawn Hoffman ccd30024b3 Update to VS2013 and a slew of build-related updates. Notes:
* Currently there is no DEBUGFAST configuration. Defining DEBUGFAST as a preprocessor definition in Base.props (or a global header) enables it for now, pending a better method. This was done to make managing the build harder to screw up. However it may not even be an issue anymore with the new .props usage.
* D3DX11SaveTextureToFile usage is dropped and not replaced.
* If you have $(DXSDK_DIR) in your global property sheets (Microsoft.Cpp.$(PlatformName).user), you need to remove it. The build will error out with a message if it's configured incorrectly.
* If you are on Windows 8 or above, you no longer need the June 2010 DirectX SDK installed to build dolphin. If you are in this situation, it is still required if you want your built binaries to be able to use XAudio2 and XInput on previous Windows versions.
* GLew updated to 1.10.0
* compiler switches added: /volatile:iso, /d2Zi+
* LTCG available via msbuild property: DolphinRelease
* SDL updated to 2.0.0
* All Externals (excl. OpenAL and SDL) are built from source.
* Now uses STL version of std::{mutex,condition_variable,thread}
* Now uses Build as root directory for *all* intermediate files
* Binary directory is populated as post-build msbuild action
* .gitignore is simplified
* UnitTests project is no longer compiled
2013-10-26 17:55:38 -07:00
comex 18abc33306 2x banner images! 2013-09-25 03:06:27 -04:00
comex 693cee36cb Hack up wx to support @2x images in the toolbar. Oh please let's switch to Qt... 2013-09-25 02:03:32 -04:00
comex a38821fc38 Comment out wx change to set WS_POPUP.
Fixes issue 6651, apparently.  We don't use wxGLCanvas, so the line
isn't necessary in the first place.
2013-09-24 22:48:31 -04:00
comex 54c3b8d357 Reapply shuffle2's patch.
This is a wx bug:
http://trac.wxwidgets.org/ticket/13933
2013-09-23 02:58:04 -04:00
comex 66ed9a1804 Upgrade WX to r74856, mainly to support @2x. 2013-09-23 02:58:04 -04:00
Jasper St. Pierre 3b29320113 wx: Prevent warnings when compiling with recent versions of g++
g++ tends to think this is a string literal instead of concatenation.
2013-07-21 17:56:20 -04:00
Jasper St. Pierre 7493f19cda Squash warnings from wx
See: http://trac.wxwidgets.org/ticket/15137
2013-07-05 22:13:11 -04:00
Pierre Bourdon 4895e38bd5 This change might work better if I git add the files 2013-03-29 07:31:15 -07:00