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
a5ea6c6e93
enet: fix Visual Studio files
2015-03-02 22:20:37 +01:00
Augustin Cavalier
54072b9c8a
Make sure we unset the CMAKE_REQUIRED_LIBRARIES variable.
...
If we don't unset it, all the CMake checks will run with PortAudio
in the library list. This didn't affect those who had PortAudio,
but for select Debian systems without it, it breaks everything.
2015-02-27 20:00:02 +00:00
Augustin Cavalier
f95c55f26c
Enet: ensure CMAKE_REQUIRED_LIBRARIES is empty.
2015-02-26 23:06:58 -05:00
Ziek
779f275486
Added TraversalServer.cpp to Core/Common
2015-02-25 18:28:27 -08:00
Ziek
619a3a5171
Added all of enet lib, changed Cmake files accordingly
2015-02-25 18:28:27 -08:00
Ziek
3f367c22ee
Adding enet library for future replacement of tcp
2015-02-25 18:17:49 -08:00
Shawn Hoffman
f91e8e9423
make libusb vcxproj use standard dolphin template and don't compile strerror.c.
2015-02-18 13:29:39 -08:00
Shawn Hoffman
8645f33034
Revert "Externals: add Dolphin-specific patches to libusb"
...
This reverts commit 7a305bef86
.
2015-02-18 13:23:37 -08:00
mathieui
3b0f3cb4fe
Externals: Clean up some unneeded files from libusb
...
And add a DOLPHIN file recapitulating the changes from upstream
2015-02-12 21:58:23 +01:00
Tillmann Karras
7a305bef86
Externals: add Dolphin-specific patches to libusb
2015-02-12 01:05:22 +01:00
Tillmann Karras
4fa38f0c02
Externals: update libusb to version 1.0.19
2015-02-12 01:04:43 +01:00
Pierre Bourdon
1e809d9c11
Revert "Merge pull request #1903 from RisingFog/libav"
...
This reverts commit 34079a0037
, reversing
changes made to 3274df7158
.
2015-01-26 02:35:29 +01:00
Fog
a20b576d86
Remove un-needed files
2015-01-23 20:22:09 -05:00
Fog
6cad635bd8
Use ffmpeg for Windows Video Dumping instead of VFW
2015-01-21 19:47:45 -05:00
degasus
402fb4bd20
xxhash: Add cmake + VS files
...
Based on riking's PR.
2015-01-21 07:35:34 +01:00
degasus
b1206ffbad
Externals: add xxhash
...
Files are copied unmodified from https://code.google.com/p/xxhash/
2015-01-20 21:19:27 +01:00
Tillmann Karras
6bcdb10eee
CMake: simplify some expressions
2015-01-03 13:17:57 +01:00
Shawn Hoffman
33634b6489
windows: use qt 5.4.0
2014-12-13 20:59:40 -08:00
James Cowgill
a93f86330e
Port dolphin to SFML 2.1
2014-11-25 16:44:38 +00:00
James Cowgill
11dbe6b6ce
Update Externals/SFML to 2.1
...
- all files converted to unix line endings
- files from other subsystems and most of system have been removed
- include/SFML/System.hpp and include/SFML/Network.hpp modified to
not include removed stuff
- IpAddress.*pp renamed to IPAddress.*pp to workaround git apply bug
with case-only renames
2014-11-25 16:44:38 +00: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
035a1c0ec2
windows/qt: add (hopefully) all plugins DolphinQt should possibly need.
...
For now they are all copied to binary directory, once the project is more mature
it can be stripped down.
2014-09-18 15:24:14 -07:00
Shawn Hoffman
9d57ac68a4
Add Qt submodule for windows.
2014-09-15 15:07:42 -07:00
Augustin Cavalier
60ffe152de
PolarSSL: don't install stuff.
...
Be a little more careful next time, @Sonicadvance1!
2014-09-14 14:21:04 -04:00
Fiora
1bd8d1ee98
Add immediate tests for WriteNormalOp
...
also fix a bug in Bochs that was preventing adc from passing.
2014-09-13 16:39:34 -07:00
Ryan Houdek
a48e284317
Update external polarssl to 1.3.8
...
There were some fixes back on March 13th, 2014 for fixing compiling on MIPS64.
Also some fixes on June 25th, 2014 for SPARC64 fixes.
Probably more things, but those are what I care about.
2014-09-08 02:21:18 -05:00
Ryan Houdek
7a1eca149f
Merge pull request #841 from AMDmi3/bundled-smfl-include-order
...
Place bundled SFML include paths before others
2014-09-06 02:17:37 -05:00
skidau
ba2bec1c0a
Updated SoundTouch library to 1.8.1 [r198]
2014-09-04 20:41:45 +10:00
skidau
a148d31718
Update OpenAL-soft to 1.16.0
2014-09-03 19:48:54 +10: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
Shawn Hoffman
eb08fb5095
msvc: do not compile sample programs for miniupnpc and libpng.
2014-09-01 21:27:43 -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
1332805bb6
Add headers required by XAudio2_7 to externals.
...
This makes all builds' audio compatible with downlevel Windows and removes
the need for developers to install the June 2010 DirectX SDK.
2014-08-23 11:03:07 -07:00
Dmitry Marakasov
99df57a35e
Place bundled SFML include paths before others
...
This allows to build with bundled SFML when system SFML (of another
version) is installed
2014-08-20 17:44:18 +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
shuffle2
2270c3e90a
Merge pull request #797 from shuffle2/msvc-pch
...
Windows: Use a shared precompiled header for dolphin code under Source/
2014-08-16 14:58:28 -07:00
Fiora
290643ad25
Externals: update Bochs to newer version
...
Should resolve the disassembler not handling all the opcodes Dolphin generates.
2014-08-15 00:44:37 -07:00
Shawn Hoffman
f1b82a34b2
Windows: Use a shared precompiled header for dolphin code under Source/
2014-08-14 23:51:13 -07:00
Lioncash
0718937237
Common: Introduce the new Gekko disassembler to Common.
...
This moves the Gekko disassembler to Common where it should be. Having it in the Bochs disassembly Externals is incorrect.
Unlike the PowerPC disassembler prior however, this one is updated to have an API that is more fitting for C++. e.g. Not needing to specify a string buffer and size. It does all of this under the hood.
This modifies all the DebuggingInterfaces as necessary to handle this.
2014-08-04 00:45:07 -04:00
Lioncash
8b13afbb8e
Remove the 32-bit config platform from the VS solution and projects
2014-06-24 22:07:26 -04:00
lioncash
efdcfe404f
Fix a typo in a function prototype in PowerPCDisasm.h
...
Should be GetGPRName not GetGRPName.
Removed an unnecessary extern declaration of GetGRPName in RegisterWindow.cpp.
Also added GetFPRName to the PowerPCDisasm header for consistency.
2014-06-04 12:12:28 -04:00
Jordan Woyak
9af18d1b96
Remove SDL from Externals.
2014-05-04 19:41:02 -05:00
Pierre Bourdon
9ea845310d
Unittests: Always use GTest from Externals (recommended way from GTest FAQ).
2014-03-03 03:38:46 +01:00
Tillmann Karras
15576287f8
CMake: remove USE_SHARED_POLARSSL_LIBRARY
...
This could easily be mistaken for a Dolphin option.
2014-02-24 21:10:33 +01:00
Tillmann Karras
33beaf20f3
PolarSSL: adapt Dolphin to new version
...
- strip down PolarSSL's CMakeLists.txt
- switch to the PolarSSL 1.3 API
- use entropy interface instead of havege (PolarSSL 1.3 has disabled
havege by default because it is "considered unsafe for primary usage")
- add VS2013 .vcxproj file
2014-02-24 16:20:50 +01:00
Tillmann Karras
d025d63fd6
PolarSSL: update to current stable version (1.3.4)
...
I just removed Externals/polarssl/, added the new version, then deleted
the following files/directories:
DartConfiguration.tcl
Makefile
doxygen/
library/Makefile
programs/
scripts/
tests/
visualc/
2014-02-24 16:20:48 +01: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
Ryan Houdek
97dc20d1be
[GLExtensions] Pull in all the function pointers for OpenGL 1.1, This removes the need for a couple compile time differences between GL and GLES3 mode.
2014-01-17 16:05:40 +01:00
Ryan Houdek
10bd61a9d2
[GLExtensions] Dynamically pull in the GL 1.3 and 1.4 functions as well.
2014-01-17 15:56:54 +01:00
Ryan Houdek
71681de81a
[GLExtensions] Initial code drop for GLExtensions. This drops GLEW entirely from the codebase. This has been tested on Android and Linux+ATI. Of course untested on Windows and Apple. Also untested with Linux + EGL but should be fine there. There are most likely a couple of extensions I'm missing which would result in null pointer runs but not bad for the initial commit.
...
Conflicts:
CMakeLists.txt
Externals/GLew/glew.vcxproj
Externals/GLew/glew.vcxproj.filters
Source/Core/VideoBackends/OGL/CMakeLists.txt
Source/Core/VideoBackends/OGL/GLFunctions.cpp
Source/Core/VideoBackends/OGL/GLFunctions.h
Source/Core/VideoBackends/OGL/GLUtil.h
Source/Core/VideoBackends/OGL/Render.cpp
Source/VSProps/Base.props
2014-01-17 15:50:51 +01:00
Jasper St. Pierre
43e618682e
Convert all vcxproj files to UNIX line endings
2013-12-31 14:03:18 -05:00
Ryan Houdek
d8b7f4d73f
[Android] Support grabbing OpenGL extensions and a function for checking for support.
2013-12-28 01:08:52 -06:00
Ryan Houdek
a87e0e7489
Remove our GLU dependency. Fix static zlib
2013-12-23 16:01:34 -07:00
waddlesplash
95a1465697
Fix the ZLib in Externals. The CMakeLists file looked like it was copy-pasted from ZLib itself. It didn't work for various reasons.
2013-12-17 19:34:04 -05:00
Ryan Houdek
eb3b933dd0
Remove all instances of OpenCL in the Dolphin Project. A brief history of OpenCL in Dolphin. OpenCL was originally added to the Dolphin codebase 1 month after it was released with OS X Snow Leopard in 2009. OpenCL was one of the largest group projects that Dolphin ever has had. The OpenCL texture decoder was originally aded with version 1.0 of the OpenCL spec; This version didn't have the capability of a OpenCL-OpenGL interop which would allow for uploading textures once and have it decoded directly to a OpenGL texure. This was to be worked out when the OpenCL 1.1 spec was released and allowed the interop. This work has never been done, and no one in the team is willing to work on it for various reasons. OpenCL has had the unreasonable expectation that it increases the performance of video games that require a large amount of EFB copies like NSMBW. In reality, enabling OpenCL just put the graphics card in a higher power mode which increased the game speed. This is due to the unfortunate effect of Dolphin tending to not push GPUs out of their lower frequency power savings modes. Thanks to everyone that had contributed to the OpenCL texture decoder.
2013-12-11 15:15:55 -06:00
comex
60818222e4
Disable a certain clang warning for libpng.
2013-12-08 15:43:23 -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
f4056978c8
[windows] update SDL-2.0.0 to 2.0.1. Fixes issue 6793.
2013-11-04 23:50:52 -08:00
comex
3f1ea21e4f
Fix warnings.
2013-11-03 20:54:06 -05:00
Matthew Parlane
dab9af43a4
[Windows] Add missing dlls and enable OpenMP support.
2013-11-03 11:54:45 +13: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
a9908fdf09
Fix build issues on OS X i386.
2013-10-07 02:16:51 -04:00
Matthew Parlane
d261dfaf46
Upgrade libusb to 1.0.16
2013-09-30 18:36:54 +13: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
comex
cf4d015b2a
Don't disable SO_REUSEADDR on non-Windows, where it is safe.
2013-09-22 16:11:43 -04:00
Ryan Houdek
6340ad68be
Merge branch 'GLES3-FSAA'
2013-09-22 10:00:51 -05:00
Ryan Houdek
91619e28b8
Pull in the glRenderbufferStorageMultisample function pointer at run time.
2013-09-22 09:10:47 -05:00
Pierre Bourdon
323ecdb772
Ship vcomp100.dll with Dolphin
2013-09-22 16:00:56 +02:00
Matthew Parlane
6dc16a59f8
Made defaults "explicitly defaulted" for PolarSSL Fixes issue 6601
2013-09-15 11:13:06 +12:00
Jordan Woyak
0fc1ca0169
Make Bochs_disasm not depend on Common.
2013-09-12 12:26:59 -05:00
Ryan Houdek
160d72a9ae
[Android] Add in a static libiconv library so non English games don't crash Dolphin Mobile.
2013-08-29 04:43:31 -05:00
Matthew Parlane
d3bc69fe20
Remove ltcg from polarssl.
2013-08-26 23:26:11 +12:00
Matthew Parlane
72e0423f8b
Fix debug builds. Sorry.
2013-08-25 13:39:30 +12:00
Matthew Parlane
5548e77438
Merge branch 'master' into wii-network
2013-08-24 23:56:31 +12:00
Matthew Parlane
b6e054a2be
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Core.vcxproj
Source/Core/Core/Core.vcxproj.filters
Source/Core/Core/Src/CoreParameter.cpp
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
2013-08-23 00:51:12 +12:00
skidau
5cec914484
Changed the default audio latency to 2. Made soft_oal.dll the default on Windows builds as the old OpenAL32.dll is outdated and contains bugs.
2013-08-18 17:03:21 +10:00
Matthew Parlane
4ac0fb0a3e
Remove unneeded polarssl files.
2013-08-16 21:36:36 +12:00
Matthew Parlane
9de7611ff9
Merge branch 'master' into wii-network
...
Conflicts:
CMakeLists.txt
Source/Core/Core/Core.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
Source/Dolphin_2010.sln
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-08-16 19:17:07 +12:00
Matthew Parlane
d8b39b9dcf
Support PolarSSL on *nix
...
Removed unneeded PolarSSL directories.
Remove duplicate sha1 and md5 files.
Define out SSL test file writing.
Fix format string bug and warning.
2013-08-15 23:36:17 +12:00
Matthew Parlane
e1f8146d96
Use explicit output dir for PolarSSL
2013-08-15 21:53:52 +12:00
Matthew Parlane
b93d62dcb8
Remove LTCG and platform toolset, fix code style.
2013-08-15 21:43:43 +12:00
Matthew Parlane
fede38985e
Replace OpenSSL with PolarSSL
...
Works on windows, not yet cmake.
2013-08-15 20:47:47 +12:00
Ryan Houdek
a9ebd7d3e5
Fix Android Build.
2013-07-26 15:02:03 +00: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
Ryan Houdek
ea146627e6
[Android] Enable OpenGL ES 3 by default. Add in a modified GLES3/gl3.h header for supporting it.
2013-07-13 18:42:04 -05:00
John Chadwick
16cd26d177
Add UPnP support.
...
Feedback is in logs as suggested by skid_au. The checkbox is still there, but
mostly for people who would like to opt out (unfortunately, I can not be sure
how this feature may behave for some routers - there's a hell of a lot of bad
UPnP implementations.)
The Visual Studio stuff is a little messy, so I apologize if anything is a bit
off. I tested most configurations and it worked.
I also tested CMake on Debian Wheezy, Ubuntu Saucy, and Mac OS X Mountain Lion.
All seemed to be OK.
2013-07-09 18:08:43 -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
Tetsuo55
0c9c3c9737
forgot to add free() to the previous malloc change
2013-06-23 00:14:45 +02:00
Tetsuo55
02351b77f9
replace alloca with malloc to fix windows builds
2013-06-22 22:44:27 +02:00
Tetsuo55
1bd80d781c
fix deb-x64 and osx-x64 builds after soundtouch update
2013-06-22 21:51:11 +02:00
Tetsuo55
d8f5ecf3ce
update soundtouch to svn revision 173
2013-06-22 20:19:27 +02:00
Tetsuo55
88d1195f93
update zlib to v1.2.8
2013-06-22 17:39:46 +02:00
Ryan Houdek
2b9f79dff3
[Android] Remove SimonVT menudrawer library. Move to Google's support library for their navigation drawer support. Overall cleanup.
2013-06-22 07:45:05 -05:00
calc84maniac
a031351eb2
Use SOUNDTOUCH_INTEGER_SAMPLES only on Android build. Some audio backends (i.e. OpenAL) only support floating-point samples.
2013-05-07 23:22:28 -04:00
Matthew Parlane
e98069b647
Merge branch 'master' into wii-network
2013-04-25 01:13:14 +12:00
Ryan Houdek
453fdff4bd
Add SimonVT's android-menudrawer. This will be used in the menu interface for Dolphin Android.
2013-04-23 14:27:49 -05:00
Matthew Parlane
934e150596
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/ConfigManager.cpp
Source/Core/Core/Src/HLE/HLE_OS.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
2013-04-24 00:48:00 +12:00
Ryan Houdek
75efe7d315
Update libpng to 1.2.50 so it can be built with Clang 3.2
2013-04-18 22:11:07 -05:00
Matthew Parlane
0c9d8d34e1
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/CMakeLists.txt
2013-04-11 19:55:36 +12:00
Pierre Bourdon
4895e38bd5
This change might work better if I git add the files
2013-03-29 07:31:15 -07:00
skidau
7784fa4c67
Merge branch 'master' into wii-network
...
# By Ryan Houdek (185) and others
# Via degasus (12) and others
* master: (625 commits)
Revert "Don't open/close file for every file operation." as it was crashing PokePark in Windows builds.
Array overrun fixed in VertexShaderCache for the DX11 plugin.
Fixed DSPTool build.
Windows build fix
Go back to assuming every HID device is a wiimote on Windows. Fixed issue 6117. Unfixed issue 6031.
VideoSoftware: Improve fog range adjustment by using less magic and more comments.
revert RasterFont for VideoSoftware
ogl: fix virtual xfb
Windows build fix from web interface...
Adjusted the audio loop criteria, using >= on the Wii and == on GC. This fixes the audio static that occurred in Wii games after hours of play.
Forced the exception check only for ARAM DMA transfers. Removed the Eternal Darkness boot hack and replaced it with an exception check.
VideoSoftware: Implement fog range adjustment, fixing issue 6147.
implement 4xSSAA for OGL
move ogl-only settings into backend
Fix description of disable fog, and move it to enhancements tab.
Reverted rd76ca5783743 as it was made obsolete by r1d550f4496e4.
Removed the tracking of the FIFO Writes as it was made obsolete by r1d550f4496e4.
Forced the external exception check to occur sooner by changing the downcount.
Mark the Direct3D9 backend deprecated.
Prefer D3D11 and OpenGL over D3D9 by default.
...
Conflicts:
CMakeLists.txt
Source/Core/Common/Common.vcxproj.filters
Source/Core/Common/Src/CommonPaths.h
Source/Core/Core/Core.vcxproj.filters
Source/Core/Core/Src/Core.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-03-27 13:19:23 +11:00
Ryan Houdek
8c1091a21f
Merge branch 'master' into GLSL-master
...
Conflicts:
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
2013-03-15 11:19:52 -05:00
skidau
808eaf7c49
Fixed the Windows 32bit debug build.
2013-03-14 22:18:13 +11:00
degasus
a1c5e90083
Merge branch 'master' into GLSL-master
...
Conflicts:
CMakeLists.txt
Source/Core/DolphinWX/CMakeLists.txt
Source/Core/DolphinWX/Src/GLInterface.h
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/TextureCacheBase.cpp
Source/Core/VideoCommon/Src/VertexManagerBase.cpp
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
2013-03-06 15:59:29 +01:00
Ryan Houdek
0bd218ea8e
Update CLRun to have OCL 1.2
2013-02-23 01:47:37 -05:00
degasus
f677b8cba3
update to glew1.9, win binaries also from official release
2013-02-04 21:11:12 +01:00
Matthew Parlane
ca4ea817e0
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Common/Src/FileUtil.h
Source/Core/Core/Src/HLE/HLE.cpp
Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
2013-01-26 21:46:12 +13:00
degasus
e0ffdda26e
Merge branch 'immediate-removal' into GLSL-master
...
Conflicts:
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
2013-01-24 16:58:28 +01:00
skidau
6d4a566bc4
Changed SoundTouch to use float samples, allowing SSE to be used.
...
Made the DPL2 decoder disabled by default.
Re-added the audio hack used by the Accurate VBeam emulation option.
2013-01-15 22:29:26 +11:00
Matthew Parlane
9754fda516
Merge branch 'wii-usb' into temp merge branch
...
Conflicts:
Source/Core/Common/Src/Log.h
Source/Core/Core/Core.vcxproj
Source/Core/Core/Core.vcxproj.filters
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-01-11 23:07:12 +13:00
skidau
80f4475e76
Added a Dolby Pro Logic II (DPL2) decoder in the OpenAL backend. DPL2 audio is decoded to 5.1. Code adapted from ffdshow.
...
Added an option in the DSP settings to disable the DPL2 decoder in case Dolphin incorrectly detects a 5.1 audio system.
Updated the OpenAL files to OpenAL Soft 1.15.1 in the Windows build.
Fixes issue 3023.
2013-01-11 14:03:09 +11:00
Ryan Houdek
01f4d9f386
Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.
2013-01-09 10:26:12 -06:00
skidau
7600cf106b
OSX: typedef signed char BOOL
2013-01-10 00:24:42 +11:00
skidau
8494a439c7
OSX build fix
2013-01-10 00:06:35 +11:00
skidau
91fe5cc821
Build fix
...
Added SoundTouch as a dependency of AudioCommon.
Removed the "soundtouch_config.h" include on Linux and OSX.
2013-01-09 23:45:13 +11:00
skidau
63b38be97c
Added audio time stretching by using the SoundTouch library.
2013-01-09 22:57:32 +11:00
skidau
6df1dacca8
OpenAL for Windows initial commit
2013-01-07 12:16:04 +11:00
Matthew Parlane
e0c9a1fd09
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Core/CMakeLists.txt
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
2013-01-01 23:28:46 +13:00
Matthew Parlane
21fa664c2d
Hopefully fix win32 build issues.
2012-12-31 03:51:34 +13:00
degasus
316a33d1e6
Merge branch 'master' into GLSL-master
...
Conflicts:
Source/Core/DolphinWX/Src/VideoConfigDiag.h
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2012-12-27 10:36:54 +01:00
Ryan Houdek
9209253e0d
Initial removal of Nvidia CG. Still some more cleanup to go
2012-12-24 11:09:52 -06:00
Matthew Parlane
f6418bd093
Merge branch 'master' into wii-usb
2012-12-24 12:58:15 +13:00
Matthew Parlane
c626d5aae3
Move to 1.0 libusb.
2012-12-24 08:31:50 +13:00
Matthew Parlane
a76059377d
Warning free SOIL lib.
2012-12-23 19:24:57 +13:00
NeoBrainX
4fc0125fb3
Fix OS X 10.6 compatibility.
...
Patch by mathieudel.
2012-12-07 19:49:08 +01:00
Matthew Parlane
d6e46dd7e2
Add new lib and header for libusb 1.0.
2012-11-19 20:55:52 +13:00
Matthew Parlane
d8b879a4ee
Movd back to libusb for full support on windows
2012-11-15 01:09:25 +13:00
Matthew Parlane
586813b150
Basic HID works on windows! I had to customise HIDAPI.
2012-11-13 00:14:47 +13:00
Pierre Bourdon
fdff4cb1ff
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2012-05-16 09:27:37 +02:00
Matthew Parlane
8ba2abc699
Fixed x64 lib.
2012-04-04 19:55:46 +12:00
Matthew Parlane
e46779e3bd
Add lib files.
2012-04-04 19:55:17 +12:00
Matthew Parlane
db6e981728
Added hidapi start. x64 doesn't work... not sure why.
2012-04-04 19:54:32 +12:00
Matthew Parlane
9bf67d4bb1
Implemented /dev/usb/hid as libusb, but this will not work on mac. Code started for using hidapi instead.
2012-04-04 19:53:05 +12:00
Shawn Hoffman
56b1373baf
Remove scons-related files
2012-03-25 12:55:02 -07:00
Shawn Hoffman
e25d29bf67
Remove old version of wxWidgets from Externals
2012-03-25 12:45:34 -07:00
Shawn Hoffman
7d57b925e6
Disable wxHAS_MSW_TASKDIALOG because as of wxW svn r70933,
...
there is a bug with the wxPD_AUTO_HIDE style which can cause a non-dolphin
window to come to the foreground after auto-closing of the TaskDialog.
2012-03-24 20:59:20 -07:00
Shawn Hoffman
f7423a0a4f
Merge branch 'master' into wxw3-update
...
Conflicts:
Source/Core/DolphinWX/Src/LogWindow.cpp
2012-03-22 17:57:38 -07:00
Pierre Bourdon
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
Shawn Hoffman
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
Shawn Hoffman
20bb7a28b5
wxw3: update wx/setup.h for wxgtk to be compatible with current version
2012-03-19 04:59:48 -07:00
Shawn Hoffman
00fed2e70e
wxw3: revert wx/setup.h for wxgtk to the previous version
2012-03-19 04:59:48 -07:00
skidau
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
Shawn Hoffman
ec6d2572c1
oops, forgot to disable WDMKS on portaudio 32bit build
2012-03-19 03:40:21 -07:00
Shawn Hoffman
2ab2afaa1f
update portaudio to stable_v19_20111121 and fix linker warnings
2012-03-18 07:50:37 -07:00
Shawn Hoffman
c5d746f3d8
remove scons files from VS projects
2012-03-18 06:41:12 -07:00
Shawn Hoffman
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
Shawn Hoffman
c3d13b048c
build against wxWidgets3 from Externals on Windows.
...
use Externals version of libpng on Windows.
2012-03-18 02:31:19 -07:00
Shawn Hoffman
360c8d4cb3
make same changes to CMake as scons for wxw3 update
2012-03-17 22:16:54 -07:00
Shawn Hoffman
a648aca65c
wxWidgets3: update to svn r70933
2012-03-17 21:47:47 -07:00
Shawn Hoffman
5b01af5a37
openssl: fix linker warning by adding those pesky pdb files.
2012-02-27 00:54:11 -08:00
Shawn Hoffman
e5b7e81f44
openssl: enable ec/dsa and rearrange files in Externals a bit.
2012-02-27 00:51:50 -08:00
Shawn Hoffman
cb03841b7f
Add forgotten openssl libs and fix problems from merging Core VS project files.
2012-01-11 21:53:48 -08:00
Shawn Hoffman
8a1ca0f1b8
add openssl to externals
2012-01-05 02:59:46 -08:00
Maarten ter Huurne
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
Maarten ter Huurne
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
Maarten ter Huurne
2621d89a41
Link OS X version of wxWidgets against libpng and libiconv.
2011-12-05 06:07:10 +01:00
Maarten ter Huurne
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
Maarten ter Huurne
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
Shawn Hoffman
29f52ce6dd
gcc sux
2011-11-20 16:25:23 -08:00
Shawn Hoffman
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
Shawn Hoffman
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
Shawn Hoffman
d8def74dd1
add portaudio headers and windows static libs to Externals, enable by default in windows build.
2011-10-03 23:45:59 -07:00
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
Jordan Woyak
cbc520a70a
Committing Visual Studio 2010 solution/project files. (not switching from 2008 just yet, just making 2010 an option) Still need to add a "DebugFast" config and change optimization settings.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6927 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-27 00:14:29 +00:00
Shawn Hoffman
d3b8908a7c
Make CDolLoader a bit more c++ish, make wii dols be detected by the presence of a mfspr x, HID4.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6909 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-24 21:54:19 +00:00
Soren Jorvang
e53c8188c0
Update Cg.framework to version 3.0.0015.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6900 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-24 00:26:39 +00:00
Soren Jorvang
392a589092
Drop support for building on OS X 10.5. It is too much hassle to
...
work around the limitations of the no longer maintained Xcode 3.1.4
for Leopard. Running a 10.6-built app on 10.5 works fine through
through the use of the 10.5 SDK.
std::locale() seems to be the generally safer way to specify the
default locale and works on Linux and OS X at least. Thanks to
dasmetzelmaennchen for the pointer.
Remove some obsolete SCons related svn:ignores.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6893 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-22 02:18:25 +00:00
Shawn Hoffman
afebc0d1d3
Allow usbgecko to try a range of ports, such that multiple dolphin instances will setup their servers on consecutive ports starting at 55020.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6877 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-19 02:17:11 +00:00
Glenn Rice
83eed62449
Build mo translation files on all platforms. Had to import msgfmt executable in the Externals to do this on windows.
...
Save wxLanguage enumeration value in ini file so that users are not surprised when a language is added and dolphin-emu is suddenly translated in a different language.
Update Spanish, Korean, and Simplified Chinese translations.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6804 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-10 19:26:36 +00:00
Soren Jorvang
70f4dd9df3
Lipo the ppc fat out of Cg to save some space.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6799 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-09 21:05:34 +00:00
NeoBrainX
81638396c0
Some more work on CMake on Windows:
...
- add support for precompiled headers with MSVC
- compile with _FILE_OFFSET_BITS=64 and _LARGEFILE_SOURCE only for our sources, some dependencies seem to have problems with it enabled...
- disable -Wall for MSVC too prevent warning flood
- rename aes_cbc.c and aes_core.c to cpp files since it makes stuff a lot easier and there's really no reason not to do it since they had been compiled as C++ before anyway
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6797 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-09 16:36:19 +00:00
Soren Jorvang
95b6d3f445
Kill HAVE_OPENCL.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6756 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-06 01:11:32 +00:00
Soren Jorvang
613b0f4c51
Upgrade GLEW to version 1.5.7:
...
New extension:
GL_NVX_gpu_memory_info
Bug fixes:
Improved mingw32 build support
Improved cygwin build support
glGetPointervEXT fix
Add GLEW_VERSION_1_2_1
Fixes issue 3798.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6689 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-30 02:43:50 +00:00
Soren Jorvang
0ecf88c300
LUA_USE_LINUX is suitable for everything but Win32 really.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6529 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-12-05 16:03:48 +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
Christian Morales Vega
7632a5abd4
Fix for issue 3507. Compile with old GLEW versions, support user-specified CFLAGS and link plugins to all the used libs.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6441 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-18 23:27:27 +00:00
Glenn Rice
a279b391cc
Make Linux/MacOSX system checks correct in the cmake build. UNIX is true on both linux and osx. The cmake build probably still doesn't work on MacOSX though.
...
Also added an option to explicitly disable building with MPG framedumps. To use it add -DENCODE_FRAMEDUMPS=OFF to cmake on the command line.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6429 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-17 01:03:39 +00:00
Shawn Hoffman
7ad7acd248
move wiiuse to Source/Core and add to the main dolphin solution
...
make wiiuse link dynamically with hid.dll, removing the need for WDK
compile wiiuse as c++
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6394 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-13 19:15:43 +00:00
snzgoo
8eb1fe8831
proper .libs fixing building problems under vs2008, x32 and x64. Please dont use vs2010 for buildings those static libs next time to keep compatibility under vs2008 atm.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6393 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-13 13:17:48 +00:00
Shawn Hoffman
02d1321bcb
windows: update wiiuse libs, since logging functions were changed in common...
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6392 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-13 00:24:34 +00:00
Shawn Hoffman
820c0022a5
Windows: Link debug build against debug wiiuse. Can't keep linking to the release wiiuse as it does not use the same crt.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6388 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-12 19:00:21 +00:00
Shawn Hoffman
ae8c943669
build wiiuse as a static lib on windows.
...
make wiiuse log via Common lib on windows.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6386 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-12 17:53:54 +00:00
Glenn Rice
7b34def0fc
A couple of changes to the cmake build system.
...
First: Added a DESTDIR option for package building.
Second: Change the OpenCL setup. On both linux and windows use CLRun. I completely removed the option here. If CLRun works on MacOSX this should be done there as well, and this change implemented in the scons build also. Then we could remove the HAVE_OPENCL and the new USE_CLRUN definitions. Then we will finally have the dynamic detection of opencl set up cross platform.
On a side note, it doesn't seem that the program loaded from TextureDecoder.cl compiles or runs.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6366 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-10 01:59:53 +00:00
Soren Jorvang
7dd7bd2b03
Write bluetooth packets asynchronously to prevent blocking on
...
commands that take some time to complete in the wiimote.
From <matthew.powersfreeling>. Fixes issue 3437.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6365 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-09 20:46:11 +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
Glenn Rice
57f01776ef
Fix cmake so it is possible to build without bluetooth support, and the typo that tells you bluetooth is enabled when it is not.
...
Fixes issue 3464.
Also make the check for portaudio really check the version of portaudio.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6359 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-08 02:51:31 +00:00
Glenn Rice
e96943c121
Added an option in the cmake build to disable wxWidgets. To use add "-DDISABLE_WX=1" to the cmake configuration command. Also fixed the nowx build.
...
Set scons build to autodetect OpenCL by checking for both the library and header instead of having an option. Unfortunately there probably needs to be a path variable that can be set to the location to look for the headers. For example on Ubuntu with nvidia, the headers are located in /usr/include/nvidia-current instead of /usr/include, and hence not found by scons.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6355 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-07 17:45:35 +00:00
Glenn Rice
7864f3c087
Missed a needed -fPIC.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6350 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-05 23:38:37 +00:00
Glenn Rice
3aff478b3a
Add the c++ definition HAVE_CONFIG_H in the scons build and check it before including config.h so the cmake build system doesn't need to worry about conflicts from that file if it exists.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6342 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-04 20:33:45 +00:00
NeoBrainX
b75a805859
Add an experimental CMake build system as a possible replacement for SCons. Only tested on Linux, should work on OS X and Windows in the future as well though.
...
Some notes about this:
- config.h doesn't get written yet, so you'll have to use one generated by SCons
- dependency checking isn't really implemented, yet. Just some basic checks for OpenGL or ALSA, we need something more sophisticated though.
- the OpenGL plugin fails to load for some reason which I can't debug right now due to the libc debuginfo package version in openSUSE not matching the runtime packages
- there's even some support for generating install packages (rpm/deb/.. packages, NSIS installer, etc). It doesn't work properly right now though, since some paths seem to be hardcoded into Dolphin's source
- probably lots of other stuff I forgot... Just take a look at all the TODOs in the CMakeLists.txt files for more information ;P
Additionally, I added various files to the svn:ignore list.
tl;dr: Unless you are a dev or you're building binary packages, this commit shouldn't bother you :P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6326 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-01 15:47:02 +00:00
LPFaint99
c015811d4d
remove standalone MemcardManager, now has its own repo
...
(http://code.google.com/p/gcn-memcard-manager/ )
add some svn:ignores (windows build dirs)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6320 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-30 07:30:32 +00:00
Soren Jorvang
78ab1c0f3f
More robust way of building on 10.6 for a 10.5+ target.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6314 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-24 20:07:12 +00:00
Soren Jorvang
7c0cae9e8b
Get the htonl/htons prototypes on all Unix-likes.
...
Clean up a few remnants of the --wiimote_plugin command-line option.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6277 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-13 13:18:17 +00:00