Commit Graph

54 Commits

Author SHA1 Message Date
khg8m3r
d2c4f3af19
Update SDL to release-2.30.6 and fix build errors for Windows and CMake 2024-08-13 11:11:56 +02:00
Jordan Woyak
25833cfd62 CMake: Hide warnings in Externals also for non-msvc. 2024-03-19 01:12:52 -05:00
TellowKrinkle
5b10a80401 CMake: Use targets for all optionally-external dependencies 2023-06-15 01:41:41 -05:00
OatmealDome
33836d630a Externals: Update SDL to 2.26.5 2023-04-12 16:00:08 -04:00
Shawn Hoffman
cea95146e0 update sdl 2023-02-18 12:34:44 -08:00
Shawn Hoffman
6d4b3e6348 sdl: update to latest sdl2 2023-01-24 04:46:53 -08:00
TellowKrinkle
db8f08b2bb Externals: Update SDL to 2.26.0 2022-11-24 15:33:42 -06:00
Shawn Hoffman
97064eb7a0 SDL: update to 42d09a8f42e3fbac7171d065199667b182da3fb4
post-v2.24.0 commit
fixes SDL hotplugging issues on windows
2022-08-30 15:22:40 -07:00
Admiral H. Curtiss
8b7e6f1863
Merge pull request #10933 from shuffle2/vs
msbuild: fix overbuilding of externals and lessen rebuild likelyhood
2022-08-22 15:19:13 +02:00
Shawn Hoffman
a1941156b6 SDL: update submodule to 5aa438e80aabe3570c0ef807d9b22bcd9835ced6
for a Windows.Gaming.Input fix
2022-08-08 16:10:10 -07:00
Shawn Hoffman
c5da2877cc msbuild: refactor to reduce rebuild events
* moves dolphin-specific settings out of Base.props
* creates exports.props for externals, allowing to easily import
  individual Externals
* corrects some cruft that accumulated and probably contributed
  to msbuild overbuilding
2022-08-02 22:24:22 -07:00
Jun Bo Bi
ceed42a0ee Add SDL as a submodule 2022-07-10 15:38:59 -07:00
Jordan Woyak
9af18d1b96 Remove SDL from Externals. 2014-05-04 19:41:02 -05:00
comex
3f1ea21e4f Fix warnings. 2013-11-03 20:54:06 -05: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
Shawn Hoffman
56b1373baf Remove scons-related files 2012-03-25 12:55:02 -07: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
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
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
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
Soren Jorvang
7901e74f00 Reestablish *BSD build using CMake.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6516 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-04 15:19:04 +00:00
NeoBrainX
4782a8fc5a More CMake work:
- various fixes for using CMake on Windows
- support building external SDL, zlib, CLRun, wxWidgets
- support using precompiled GLew and WiiUse libs on Windows

For what it's worth, I'm not quite sure if I got all the wx files right...
Building with MSVC2008 still doesn't work yet, but is a lot closer now.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6361 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-08 14:04:56 +00:00
Soren Jorvang
52d3137598 Build with -msse3 on OS X. The first Intel Macs were Core Duo/Solo, which
had SSE3. Keep -msse2 on other platforms. Not sure if there are actually
any Dolphin-capable machines out there without SSE3, but..

Use -search_paths_first to give our statically linked libraries precedence
over /usr/local/lib. 

Some work-in-progress changes to facilitate a more easily redistributable
application bundle on OS X.

Group compiler/preprocessor/linker flags together to make the full set
more intuitively apparent.

The various libraries in Externals have rather inconsistent conventions
for include paths. Best to encapsulate that knowledge in foo/SConscript.

Re-use utils.GenerateRevFile for all three places in the build system 
where we need the SVN revision number.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6030 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-01 16:30:22 +00:00
Soren Jorvang
fad075351c Silence some compiler warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6029 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-01 16:14:35 +00:00
Soren Jorvang
f081710800 Oops, removed one <sys/stat.h> too many.
No need to autoconf for libusbhid - all USB-capable BSD's have it.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5996 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-29 17:52:43 +00:00
Soren Jorvang
949b873dc8 Further *BSD portability.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5958 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-23 23:51:34 +00:00
Soren Jorvang
6c7e666a75 Report on the bluetooth queue depth watermark to help diagnose cases
where Dolphin blocks long enough to lose packets.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5944 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-22 06:05:08 +00:00
Soren Jorvang
83883cee45 Port to *BSD. It runs but isn't terribly useful without Cg.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5934 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-22 03:29:35 +00:00
Soren Jorvang
a2b1f829cb Get rid of a number of unnecessary env.Clones.
Use SCons' convenient # shorthand for the root of our tree.
 
Also various minor cleanup of SConscripts.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5915 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-19 03:42:37 +00:00
Soren Jorvang
980a2680be Trim down the SDL and GLEW libraries to just those files we use.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5720 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-16 09:11:29 +00:00
Soren Jorvang
b0dff28539 Attempt to resolve the conflict between SDL/include and SDL/Include.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5717 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-16 01:14:18 +00:00
Soren Jorvang
494ba1eba2 Lint.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5716 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-16 00:58:34 +00:00
Soren Jorvang
391312641c Build GLEW, SDL and zlib as static libraries from Externals as with
LZO/SFML/SOIL and subject to the same shared_foo exception options.

This makes building a self-contained distribution package much easier.

TBD: Cg and wxWidgets 2.9.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5712 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-16 00:07:52 +00:00
Soren Jorvang
2db54798d7 Import SDL 1.2.14 and GLEW 1.5.4.
I am not replacing the following header files used by the Windows build,
as I don't have a Windows build setup to test. Please point the Windows
build at the header files inside these clean distribution packages and
garbage collect the duplicates: GLew/*.h and SDL/Include_1.2.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5711 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-15 23:31:13 +00:00
Shawn Hoffman
4a0c8fc0c9 Hg:
enable newline normalization
get revision number via `hg svn info` for svnrev.h
ignore incremental/generated binary files (windows/VS at least)
leave a comment if some files need native eol set in svnprops

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5637 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-09 01:37:08 +00:00
Shawn Hoffman
18305c7c49 revert sdl changes, part 2 (final)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4565 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-14 16:59:54 +00:00
Shawn Hoffman
235a19e356 revert sdl changes, part 1
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4564 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-14 16:58:39 +00:00
John Peterson
7f66fe1ef6 Externals > Added copy SDL.dll build event
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4542 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 20:14:44 +00:00
John Peterson
dcb856fe3c Externals > Fixed SDL include
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4540 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 19:30:57 +00:00
John Peterson
5ef7d6888a Externals > Fixed SDL include, properly
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4539 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 19:29:15 +00:00
John Peterson
013a27b13b Externals > Fixed SDL include
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4538 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 19:26:25 +00:00
John Peterson
088440ab12 Externals > renamed SDL dir to match their SVN names
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4537 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 19:07:17 +00:00
John Peterson
92590357bb Externals > renamed SDL dir to match their SVN names
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4536 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 19:06:51 +00:00
John Peterson
32e9352e64 Externals > Deleted SDL dirs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4535 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 19:05:32 +00:00
John Peterson
71506bc0f7 Wiimote and nJoy > Gamepad changes
1. Added LiveUpdates, while the configuration window is open nJoy and Wiimote will check for connected/disconnected pads
2. Removed the 'Nintendo RVL-CNT-01' device from the device list, and other SDL devices with no axes/buttons
3. Added SDL (from the current SVN) to get debugging information for SDL.dll
4. Added 'Upright Wiimote' option to emulated Wiimote options

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4534 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 18:57:35 +00:00
sl1nk3.s
e24e2db1a1 Set SDL 1.2 as default for now, better use stable SDL instead of alpha 1.3 :p
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2839 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-04-02 21:10:35 +00:00
omegadox
8f98f0b778 Some warning and code cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1998 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 00:45:46 +00:00
daco65
be1e403435 JPeterson forgot a header of SDL 1.2
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1933 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 17:23:39 +00:00
John Peterson
c981d64ee4 SDL: Upgrade to 1.3
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1927 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 05:44:43 +00:00
John Peterson
2485e01b63 SDL: Preparation for upgrade
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1926 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 05:43:19 +00:00