Commit Graph

367 Commits

Author SHA1 Message Date
Shawn Hoffman 95517a9741 vs2010: Disable LTCG for realz 2011-09-05 09:43:23 -07:00
NeoBrainX 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
gnick79 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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Nolan Check 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
Soren Jorvang 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
Soren Jorvang 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
Shawn Hoffman 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
Shawn Hoffman 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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Soren Jorvang 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
Shawn Hoffman 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
Shawn Hoffman 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
Shawn Hoffman 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
Soren Jorvang 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
Shawn Hoffman 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
Shawn Hoffman 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
hrydgard 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
Soren Jorvang 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 7fc40de8c7 update Cg on windows to 3.0 November 2010...I tested it and didn't see the problems mentioned in issue 4009.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7078 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-05 05:55:12 +00:00
Shawn Hoffman 2d3a7b4155 update zlib to 1.2.5
"Version 1.2.5 fixes bugs in gzseek() and gzeof() that were present in version 1.2.4 (March 2010). All users are encouraged to upgrade immediately."
...

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7076 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-05 05:29:27 +00:00
Shawn Hoffman 0841be0fea Update miniLZO to 2.0.4. Apparently fixes a bug when used with gcc 4.5
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7075 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-05 04:59:33 +00:00
Shawn Hoffman 4a20647ab6 update libjpeg to 8c
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7074 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-05 04:47:16 +00:00
Shawn Hoffman ce004d4db9 update GLew to 1.5.8 Fixes issue 4049
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7073 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-05 04:21:42 +00:00
Shawn Hoffman a46117219b vs2010: fix some linker warnings from wxw
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7070 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-05 03:20:31 +00:00
Soren Jorvang cc289a05bb Turn back on unit tests in SCons.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7057 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-04 01:02:06 +00:00
Soren Jorvang 6d70c14d12 In the SCons build, skip the generation of static libraries
and just operate on lists of object files instead.

This helps with LTO since LLVM/clang LTO is completely broken
by static libraries. It also helps identify symbol clashes
between components like the former plugins.

Many linkers also expect static libraries to form a strict DAG
which turns out be a difficult rule to uphold in practice,
especially since some of our platforms aren't picky about this.

LTO builds currently appears to crash at runtime because of
the static wx libs.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7056 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-04 00:46:56 +00:00
Shawn Hoffman ac3f2d9c19 Remove OpenAL for windows.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7053 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-03 21:35:26 +00:00
Jordan Woyak dfe84ce0ac Removed the Lua script console and Externals/Lua. The script console was incomplete and no one was working on it.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7051 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-03 20:41:23 +00:00
Soren Jorvang 9c21d003af Remove the global namespace a bit and remove some dead code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7043 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-02 18:21:20 +00:00
Shawn Hoffman af9ef060c0 vs2010: Enable LTCG only for release builds.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7032 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-01 04:45:29 +00:00
Shawn Hoffman 118d623a18 vs2010:
fix all build targets (they've all built here - you may have to manually delete the intermediate directories if you have conflicts after this commit).
set the debug path to $(TargetDir)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7022 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-31 15:53:54 +00:00
Jordan Woyak 84f26a1afc vs2010 wxw project filters, converted from vs08 projects.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7018 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-31 09:25:42 +00:00
Shawn Hoffman c5d61c0a9a vs2010: buildfix for debugfast, silence all C4996 warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7016 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-31 08:53:08 +00:00
Shawn Hoffman 3b36e06571 svn eol-style:native on the filters...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7013 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-31 07:58:59 +00:00
Shawn Hoffman 7ae1340179 vs2010 add filters for everything (...except wxw projects...). Try to fix SVNRevGen, but I'm not sure it's working...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7012 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-31 07:51:37 +00:00
Glenn Rice f1e8da63ec Linux build fix.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6999 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-31 02:13:10 +00:00
Soren Jorvang 25716f067c Revert to Cg.framework 3.0.0007. 3.0.0015 has problems.
Fixes issue 4009.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6982 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-30 02:27:44 +00:00
Soren Jorvang b3a183dffe Core and DSPCore now have mutual dependencies, which breaks the
assumption on the part of many linkers that static libraries make
up a DAG, so merge libdspcore into libcore.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6967 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-29 14:06:48 +00:00
Soren Jorvang 2a7f305d45 Some preliminary cleanup of the global namespace for LTO.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6942 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-28 00:53:30 +00:00
Soren Jorvang 0288742565 Various minor fixes to allow building with clang on OS X.
Fixes issue 3992. 

wxWidgets patch at http://trac.wxwidgets.org/ticket/12332 .


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6929 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-27 05:01:00 +00:00