f7423a0a4f
Merge branch 'master' into wxw3-update
...
Conflicts:
Source/Core/DolphinWX/Src/LogWindow.cpp
2012-03-22 17:57:38 -07:00
5242f09104
Fix Linux build: search for gthread-2.0 and pangocairo, then add both these libs to wx dependencies
2012-03-23 01:06:45 +01:00
6091774ade
get wxw3 building on linux
...
kind of hacky because currently, shared libpng is always expected to be used
on darwin, libpng in externals is always used
2012-03-19 04:59:49 -07:00
20bb7a28b5
wxw3: update wx/setup.h for wxgtk to be compatible with current version
2012-03-19 04:59:48 -07:00
00fed2e70e
wxw3: revert wx/setup.h for wxgtk to the previous version
2012-03-19 04:59:48 -07:00
281d7531a3
Fixed a crash on exit by calling DefWindowProc after the WM_DESTORY message has been received. Patch by eddie.willett.
...
Fixes issue 4588.
Fixes issue 5285.
2012-03-19 21:51:26 +11:00
ec6d2572c1
oops, forgot to disable WDMKS on portaudio 32bit build
2012-03-19 03:40:21 -07:00
2ab2afaa1f
update portaudio to stable_v19_20111121 and fix linker warnings
2012-03-18 07:50:37 -07:00
c5d746f3d8
remove scons files from VS projects
2012-03-18 06:41:12 -07:00
d9a7510937
forgot to add wxwidgets3 vcxproj to git, since it was masked by gitignore...
...
fix up misc warnings and build errors
2012-03-18 03:30:03 -07:00
c3d13b048c
build against wxWidgets3 from Externals on Windows.
...
use Externals version of libpng on Windows.
2012-03-18 02:31:19 -07:00
360c8d4cb3
make same changes to CMake as scons for wxw3 update
2012-03-17 22:16:54 -07:00
a648aca65c
wxWidgets3: update to svn r70933
2012-03-17 21:47:47 -07:00
9ede977a56
Added QuickTime framework as dependency for wxWidgets on OS X.
...
It seems that the required functions are in an already included framework
on x86_64, but on i386 we depend on QuickTime.
2011-12-11 21:24:40 +01:00
f9133a7376
Link to the required OS X frameworks.
...
Previously, there was just one list of frameworks regardless of which part
of the code depended on which frameworks. Now we keep separate lists for
the Dolphin core, the Dolphin GUI and internal use by wxWidgets.
2011-12-07 08:26:44 +01:00
2621d89a41
Link OS X version of wxWidgets against libpng and libiconv.
2011-12-05 06:07:10 +01:00
7ebb0e526f
Added CMakeLists.txt for libpng.
...
The vast majority of the changes in this commit were originally done
by Shawn Hoffman in commit c86846cf9c995d8e0463419bd9477b0dae884929.
2011-12-05 05:10:21 +01:00
d249ee599a
Added CMakeLists.txt for wxWidgets under OS X.
...
The vast majority of the changes in this commit were originally done
by Shawn Hoffman in commit c86846cf9c995d8e0463419bd9477b0dae884929.
2011-12-04 15:43:52 +01:00
29f52ce6dd
gcc sux
2011-11-20 16:25:23 -08:00
73beeaf45a
Change the mask shown for rlw* to be shifted. ie the result of the instruction is source & mask, right-aligned.
2011-11-20 15:35:43 -08:00
78832cb4ea
Update to portaudio SVN rev 1762
...
Disable portaudio backend for wdmks (fixes debug build on windows)
2011-10-23 18:17:50 -07:00
d8def74dd1
add portaudio headers and windows static libs to Externals, enable by default in windows build.
2011-10-03 23:45:59 -07:00
95517a9741
vs2010: Disable LTCG for realz
2011-09-05 09:43:23 -07:00
c84cddc83a
Revert r7078.
...
Downgrades Cg to 3.0.0007 again since the November release caused too much trouble for some users.
Fixes issue 4107.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7595 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-06-13 11:17:36 +00:00
156c914185
- Time extended in which the tooltip remains visible. (Windows PTFs)
...
- Better fix/location (wxWidgets source) for the MenuPopup fix. (Windows PTFs)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7475 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-04-20 15:25:21 +00:00
35508d7a99
Update to wxWidgets r67291.
...
Fixes a wxFileSelector regression on OS X.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7404 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-23 09:13:01 +00:00
d332cc342d
OS X also needs to have the display resolution changed before
...
setting wxFULLSCREEN_ALL.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7390 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-21 16:06:40 +00:00
215baff4c8
Simplify the SCons build:
...
With wxWidgets 2.9.2 now in Externals, SCons was the only
external dependency other than Xcode and building just SCons
from Macports caused a fair mount of extra stuff to be built
unnecessarily, so just include a copy of scons-local.
Always build wxWidgets from Externals which allows us to get
rid of the home-grown autoconf machinery in SconsTests.
The main use case for args.cache was the wxconfig option,
which is no longer relevant after the above changes and
caching options has a lot of potential for confusion,
especially since other build systems don't tend to do this,
so we no longer do it now.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7381 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-20 18:35:07 +00:00
d14efe561b
Import r67258 of the wxWidgets trunk, which I expect will before
...
long become wxWidgets 2.9.2, which in turn is expected to be the
last 2.9 release before the 3.0 stable release.
Since the full wxWidgets distribution is rather large, I have
imported only the parts that we use, on a subdirectory basis:
art
include/wx/*.*
include/wx/aui
include/wx/cocoa
include/wx/generic
include/wx/gtk
include/wx/meta
include/wx/msw
include/wx/osx
include/wx/persist
include/wx/private
include/wx/protocol
include/wx/unix
src/aui
src/common
src/generic
src/gtk
src/msw
src/osx
src/unix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7380 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-20 18:05:19 +00:00
a23fb0eef3
Fix a couple apparent typos. a) Don't pass ASCII string to Unicode function. b) If you type "(128 / 1000)" in C++, it will be treated as "0" because the integer division gets truncated. Fixed.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7318 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-08 02:23:54 +00:00
05719ac81a
Move SConscript files out from the Src subdirectories to be
...
consistent with the other build systems.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7282 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-03 19:44:56 +00:00
540238cf79
Prepare for the release of Xcode 4, which has working LTO
...
with static libraries.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7280 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-03 04:35:03 +00:00
6e4923399e
revert r7212 (express users must modify a single line, instead)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7220 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-21 15:17:41 +00:00
62cb8ebe46
Force dolphin to use the windows7.1sdk (the windows7.1sdk installer is silly and refuses to recognize that vs2010 exists).
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7212 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-20 18:08:20 +00:00
9a9909a4d8
Stop building some unused files.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7206 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-19 21:55:14 +00:00
f46c5ce63d
Oops, forgot the libwxpng case.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7184 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-16 13:42:57 +00:00
38950e421b
Clean up shared_foo handling.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7183 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-16 13:36:41 +00:00
961ac54743
Disable use of exceptions in the wxWidgets3 build.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7177 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-15 20:18:50 +00:00
c212548f8e
Initialize all struct members.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7173 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-14 21:58:53 +00:00
f00a909103
Allow building with Externals/wxWidgets3 on Linux and import
...
libpng so it can be maintained independently of wxWidgets.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7172 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-14 21:25:08 +00:00
5b75a59d2a
Allow building with wxgtk 2.9.2 in Externals.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7155 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-12 22:31:57 +00:00
94176c02a8
Remove a few easily delineated components from the wx 2.9.2+ build.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7150 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-12 16:07:40 +00:00
e480ab2b10
drop vs2008 projects in favor of vs2010
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7129 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-11 15:43:05 +00:00
daf023f4a0
vs2010: add debugfast configs for wxw (now debugfast links faster!). clean up wxw projects a lot.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7124 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-10 06:31:12 +00:00
464d352d46
vs2010: add debugfast configs for all projects except wxw...will do those soon.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7122 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-10 02:53:08 +00:00
dbd381755b
Externals build framework for wxWidgets 2.9.2+.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7118 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-08 15:30:32 +00:00
39d176adab
vs2010: quiet wxwidgets warnings
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7110 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-08 07:08:19 +00:00
a34b81cc01
vs2010:
...
buildfix
move much of the build settings to .props files
-please use them as much as possible in the future, instead of changing individual projects
NOTE: to avoid left over blobs, clean your builds *before* applying these changes.
TODO: add DebugFast target for projects that are lacking it. Lack of DebugFast targets cause the linker to use LTCG when we don't want it.
please test for regressions which could be caused by being too happy with compiler flags :)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7109 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-08 04:03:48 +00:00
3201b61b52
LTCG (link time code gen) was off in some projects, so turn it off in all of them so that the linker doesn't have to restart halfway through.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7084 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-05 20:14:23 +00:00
98e24f5873
The compiler need not obey the static keyword, so to avoid linker
...
problems, whole functions in .h files need to also be static in
case they are included in several .cpp files.
Also a few other minor LTO fixes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7082 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-05 16:06:05 +00:00
Shawn Hoffman