Commit Graph

893 Commits

Author SHA1 Message Date
Leo Lam
a829f8faaf Merge pull request #5434 from TaoSc/master
Update libpng to 1.6.29
2017-06-04 13:52:41 +02:00
Shawn Hoffman
88ccda17d3 cubeb: don't define _MBCS or redefine _CRT_SECURE_NO_WARNINGS 2017-06-03 18:20:40 -07:00
Shawn Hoffman
d1d75ff962 remove unused msbuild file content 2017-06-03 18:20:40 -07:00
Shawn Hoffman
397720a9fe might as well update yet some more pointless version numbers.. 2017-06-03 18:20:40 -07:00
Shawn Hoffman
e8e2f329fb wxw: clean up vcxproj a bit 2017-06-03 18:20:40 -07:00
Shawn Hoffman
80642a944d wxw[msw]: disable wxUSE_DBGHELP (issue 7591) 2017-06-03 18:20:40 -07:00
Shawn Hoffman
ddae5058e9 msbuild: increment other version numbers to vs2017 equivalents 2017-06-03 18:20:39 -07:00
Arkadiy Shapkin
dda7e2cc2c VS2015/2017 build fix and enable C++11 features
Patch by KindDragon from google/googletest#811
2017-05-28 13:37:33 +02:00
BhaaL
072c161445 upgrade to Windows SDK 10.0.15063.0
this is required for /permissive- to work, because some headers in the
Windows SDK use Microsoft extensions that are not allowed in standards mode
2017-05-28 13:37:31 +02:00
Michael Maltese
34ad1eb547 Externals: remove PortAudio 2017-05-27 18:28:57 -07:00
Michael Maltese
17f4413143 Externals/cubeb: add Visual Studio build files 2017-05-27 18:28:56 -07:00
Michael Maltese
812520cc65 Add cubeb@62871b2 to Externals/
Includes submodule sanitizers-cmake@f09151b
2017-05-27 18:28:56 -07:00
shuffle2
d4faa099d9 Merge pull request #5481 from ligfx/updateqt5.8
Update ext-win-qt submodule for Qt 5.8
2017-05-27 17:59:46 -07:00
Michael Maltese
abaec0be8f Remove reference to d3dx12 license 2017-05-26 01:16:04 -07:00
Michael Maltese
00761a39c4 Remove Externals/d3dx12 2017-05-26 01:16:04 -07:00
Michael Maltese
07a23f6924 Update ext-win-qt submodule for Qt 5.8
Accompanying PR for https://github.com/dolphin-emu/ext-win-qt/pull/3
2017-05-26 01:00:15 -07:00
Pierre Bourdon
d592bdd4d4 Migrate to Visual Studio 2017.
Auto-generated by the IDE, I'll trust it knows what it's doing.
2017-05-25 15:58:59 -07:00
Tao Schreiner
100420f4d1 Update libpng to 1.6.29 2017-05-21 22:42:04 +02:00
Tao Schreiner
b3c26b6ec4 Update zlib to 1.2.11 2017-05-18 19:49:06 +02:00
Mat M
f3052b7a15 Merge pull request #5318 from ligfx/cmakehidapi
CMake: clean up HIDAPI build
2017-05-03 19:54:06 -04:00
Michael Maltese
537fbf33a7 Remove HIDAPI Autotools build system and unused files 2017-04-27 02:41:00 -07:00
Michael Maltese
655ab9b4e2 CMake: clean up HIDAPI build 2017-04-27 02:41:00 -07:00
Michael Maltese
6e1940c404 CMake: don't globally include wxWidgets headers 2017-04-25 17:18:20 -07:00
Michael Maltese
f4c0723387 CMake: move wxWidgets check_lib code into wxWidgets 2017-04-25 17:18:20 -07:00
Michael Maltese
6197d9622f CMake: move GTK+ check into wxWidgets 2017-04-25 17:18:20 -07:00
Michael Maltese
8e7648f42a CMake: modern-ize wxWidgets 2017-04-25 17:18:18 -07:00
MerryMage
8ff26a6eda soundtouch: Use shorts instead of floats for samples 2017-04-12 13:15:00 +01:00
Augustin Cavalier
0831dad467 Initial support for Haiku. 2017-03-27 23:46:19 -04:00
Chris Burgener
9b1165acf6 Update Windows ffmpeg to 3.2.4 2017-02-28 12:29:45 -05:00
Ryan Houdek
77c7fa836f Add the cpp-optparse project to Externals.
From https://github.com/weisslj/cpp-argparse
2017-02-16 14:09:13 +01:00
Léo Lam
b8dd3e690f Externals: Update mbedtls to 2.4.1
The latest version has tons of security fixes (which is expected for a
library such as mbedtls).

Updating also allows getting rid of a few deprecation warnings.
2017-02-12 10:29:02 +01:00
Michael Maltese
68dfff5798 CMake/Libusb: compile libusb/os/windows_usbdk.c 2017-02-10 16:24:16 -08:00
Sameeh Jubran
2571eb16ff Only use usbdk when installed
Check UsbDK availability at run time and activate UsbDk backend when
possible.

Fall back to current behavior when UsbDK not installed.

Signed-off-by: Dmitry Fleytman <dfleytma@...>
Signed-off-by: Sameeh Jubran <sameeh@...>
2017-02-10 13:12:41 +01:00
Matthew Parlane
d244597b42 Merge pull request #4408 from leoetlino/usb
IOS: USB support (OH0, USB_VEN, USB_HID)
2017-02-07 09:17:05 +13:00
Florent Castelli
5984ca26f3 wx: Move platform defines to wx setup header
Usually, this is passed as a preprocessor definition, but this is error
prone and just complicating the compiler invocation for no good reason.
2017-02-06 04:27:06 +01:00
Léo Lam
56fec3d72a Switch to the usbdk backend for libusb on Windows
The usbdk backend is the only libusb backend that has official support
for isochronous transfers (which are required for Wii Speak,
microphones and cameras). And it's actively developed and maintained.
2017-02-05 11:36:49 +01:00
Florent Castelli
049446d9bb cmake: Properly link against pthread on Linux using CMake's detection 2017-02-04 03:38:20 +01:00
Mat M
a3ba169e7d Merge pull request #4809 from Orphis/cmake_windows
CMake for Windows: getting a working binary!
2017-02-03 08:33:13 -05:00
Florent Castelli
12dd45266e portaudio: Remove unwanted shared portaudio library 2017-02-03 05:11:41 +01:00
Florent Castelli
3842a9b71c OpenAL: Move Windows binaries to lib folder and fix CMake detection
The module FindOpenAL is looking for the dll in a folder called lib, not x64.
This is only used on Windows x64, it's fine to remove the platform name.
2017-02-03 04:54:54 +01:00
Florent Castelli
0d73f3e3b3 mbedtls: Remove unwanted "lib" target 2017-02-03 04:24:45 +01:00
Florent Castelli
e5f576f862 gtest: Update to latest version from git 2017-01-26 03:14:08 +01:00
Markus Wick
eed64bb0fe Merge pull request #4744 from ligfx/cleanup-osx-cmake
CMake: Cleanup macOS-related logic
2017-01-24 14:36:10 +01:00
Michael Maltese
4cbd07b81f CMake: remove unneeded macOS frameworks 2017-01-24 01:27:41 -08:00
Florent Castelli
803ea7b143 cmake: Fix curl build for Windows 2017-01-24 05:48:08 +01:00
Florent Castelli
7fe8395c33 cmake: Move listctrl in wxWidgts to platform specific generic 2017-01-24 03:22:03 +01:00
Florent Castelli
fa04c1479e cmake: Remove PCH support
Compilers are very picky and don't use PCH when they have been compiled
with different flags. I even got some ICE in MSVC, so removing them for now.

Modules are the solution.
2017-01-24 03:22:03 +01:00
Matthew Parlane
7ebfd357b5 Merge pull request #4699 from Orphis/cmake_cleanup
CMake cleanup (but wait, there's more!)
2017-01-21 16:38:09 +13:00
Florent Castelli
c3e876b6be cmake: Fix building wxWidgets on Windows
And disable unused network functions.
2017-01-21 03:25:58 +01:00
Matthew Parlane
accf18431f Merge pull request #4694 from ligfx/update_portaudio
PortAudio: Update to v190600_20161030
2017-01-21 14:55:21 +13:00
Florent Castelli
796ca00f3c cmake: Don't add GCC flag to MSVC in libpng 2017-01-21 02:44:18 +01:00
Michael Maltese
69be0705d9 PortAudio/MSBuild: remove now-unused definitions
- The `PA_USE_{ASIO,WMME,...}` macros are no longer used, instead do
feature selection by compiling only the backends wanted.
- The `PA_WDMKS_NO_KSGUID_LIB` macro has been obviated along with the
link to ksguid.lib.
2017-01-20 15:40:21 -08:00
Michael Maltese
3dc7d18775 PortAudio: Update to v190600_20161030 2017-01-20 15:40:21 -08:00
Florent Castelli
08d6a24bbc cmake: Build HIDAPI on Windows 2017-01-21 00:34:02 +01:00
Florent Castelli
a7376266b3 cmake: Fix libusb on Windows and make it static 2017-01-20 17:51:29 +01:00
Florent Castelli
9e451d601c cmake: Fix glslang on Windows 2017-01-20 17:51:29 +01:00
Florent Castelli
b670f434b2 cmake: Fix bochs disasm on Windows 2017-01-20 17:51:29 +01:00
sephiroth99
2616192af3 Fix possible undefined reference when linking libusb from externals
When on Linux and using libusb from Externals, and with libudev
available, an "undefined reference" error message appears at link time.
This is due to a wrong define being set in CMake for libusb with
libudev. This causes the code for netlink being used instead of the
correct code for libudev support.

Fix the issue by setting the correct define so the correct libusb code
is used.
2017-01-09 22:48:59 -05:00
Léo Lam
04db41adf3 Externals: Update libusb to version 1.0.21
1.0.21 adds a usbdk backend, which may be helpful as it could be
used in the future to work around the missing isochronous transfer
support for WinUSB backends.

Here is the full changelog (from libusb).

2016-10-01: v1.0.21:
* Core: Refactor code related to transfer flags and timeout handling
* Darwin: Ignore root hub simulation devices
* Darwin: Improved support for OS X El Capitan
* Darwin: Work around devices with buggy endpoint descriptors
* Darwin: Do not use objc_registerThreadWithCollector after its deprecation
* Darwin: Use C11 atomics on 10.12+ as the OS atomics are now deprecated
* Linux: Support preallocating kernel memory for zerocopy USB
* Linux: Deal with receiving POLLERR before all transfers have completed
* Solaris: Add solaris backend
* Windows: Add Visual Studio 2015 support
* Windows: Add usbdk backend
* Prevent attempts to recursively handle events
* Fix race condition in handle_timeout()
* Allow transferred argument to be optional in bulk APIs
* Various other bug fixes and improvements
2016-11-20 18:11:42 +01:00
Lioncash
65a8b999b4 wxWidgets (gtk): Patch that allows label switching to work for wxToolBar
This applies a patch that was merged into the mainline wxWidgets tree to
support label changing with wxToolBar. This originally only worked on
Windows and macOS, which is kind of annoying.

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

For more details, see ticket #17567 on the wxWidgets issue tracker.
2016-10-29 02:49:45 -04:00
Vincent Duvert
671fdb8acf wxWidgets: Fix build on case-sensitive macOS
On macOS, wxWidget’s tooltip.mm tries to include a system header with an improper capitalization (Appkit instead of AppKit), which causes the build to fail if the system headers are located on a case-sensitive filesystem.
2016-10-16 11:42:41 +02:00
EmptyChaos
9df8388900 WXMSW-Patch: Fix wxTipWindow internal assertion failure. 2016-10-04 13:47:21 +11:00
shuffle2
be6aeaad33 Merge pull request #4150 from Pringo/master
Externals: Update libusb to version 1.0.20
2016-10-03 14:32:26 -07:00
Léo Lam
843b030eda WiimoteReal: Add a hidapi IO implementation
Based on ca0c2efe7a. Credits go to flacs.
However, unlike the original commit, hidapi does not completely replace
the current implementations, so we can still connect Wiimotes with 1+2
(without pairing).

Also, it is only used on Linux and OS X for now. This removes the
advantage of having only one implementation but there is no other
choice: using hidapi on Windows is currently impossible because
hid_write() is implemented in a way that won't work with Wiimotes.

Additionally:
* We now check for the device name in addition to the PID/VID so we can
  support the Balance Board and maybe third-party Wiimotes too. This
  doesn't achieve anything with the DolphinBar but it does with hidraw.
* Added a check to not connect to the same device more than once.
2016-10-03 11:41:23 +02:00
Tillmann Karras
84467d2ff1 Externals: add hidapi
Current master (d17db57b9d4354752e0af42f5f33007a42ef2906) because
Android support was added after the current release (0.8.0-rc1).
2016-10-03 11:37:24 +02:00
shuffle2
09fd2fd8e2 Merge pull request #4015 from EmptyChaos/wx-misc-fixes
WX: Fix pop-under (win) / game list garbage (win) / language support (Linux)
2016-10-02 22:46:14 -07:00
shuffle2
f71966866b Merge pull request #4230 from ligfx/build_vendored_libusb
Build vendored libusb with CMake if on Apple or not available system-wide
2016-10-02 21:17:01 -07:00
Michael Maltese
08d9c46b79 Build portaudio from Externals when not available on system
TL;DR: Enables mic support on macOS builds
2016-09-28 13:43:02 -04:00
Michael Maltese
8bb2139224 Build vendored libUSB with CMake 2016-09-28 13:32:07 -04:00
Léo Lam
e8cb4119b8 Drop Dolphin-specific patch to wxWindows
This removes a Dolphin-specific patch to the wxWidgets3 code
for the following reasons:

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

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

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

Use the correct platform macros so Dolphin can actually find the
translation catalogs on Unix.
2016-08-31 14:32:39 +10:00
Pringo
ca1c77bbf6 Patch libusb to compile on vs2015. 2016-08-25 19:05:03 -07:00
Pringo
4aea898d53 Externals: Update libusb to version 1.0.20 2016-08-25 18:27:40 -07:00
Stenzek
951fc44d86 Externals: Add glslang from Vulkan SDK v1.0.21.1 2016-08-11 22:40:32 +10:00
Stenzek
49e57df2b6 Externals: Add Vulkan headers from SDK v1.0.21.1 2016-08-11 22:40:32 +10:00
Mat M
fac7d09091 Merge pull request #3737 from EmptyChaos/update-wx
Externals: Update wxWidgets to 3.1.0
2016-07-15 09:48:14 -04:00
comex
8a02473237 Fix more warnings:
- Externals/soundtouch/CMakeLists.txt: add -w (since it's not our code) to
silence an unused variable warning
- Source/Core/Core/NetPlayClient.cpp: Work around a Clang/libc++ bug where
initializing a std::array the way the standard says you're supposed to produces
a warning.  (libc++'s implementation of std::array, like any sane
implementation, has a C array as a field, so the most explicit form of
initialization would use two braces, one for the struct and one for the array.
Clang has a general warning for not being explicit with braces, which is
usually sane.  But the standard only guarantees that initializing std::array
works with a single pair of braces!)  There are other places in Dolphin that
incorrectly use double braces, presumably to avoid the warning, so maybe the
warning should just be turned off, but in any case here I just switch to an
equivalent .fill().
2016-07-10 21:51:28 -04:00
EmptyChaos
822326eea9 Update wxWidgets to 3.1.0
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7.

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

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

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

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

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

Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
2016-06-26 15:25:29 +10:00
JosJuice
699a90a7b4 Windows: Don't include Externals\curl\lib\ everywhere 2016-06-21 10:58:50 +02:00
Pierre Bourdon
c4f5c471bb Externals: Add libcurl. 2016-06-18 18:31:40 +02:00
Ryan Houdek
ee6104d1cd Remove mbedtls header install target. 2016-03-01 17:14:09 -06:00
hdcmeta
98f74d3479 D3D12: Add d3dx12.h helper library to Externals 2016-02-15 09:48:23 -08:00
Ryan Houdek
ab0091b156 Remove mbedtls install target
Fixes 5.0 blocker bug #9208
2016-02-06 02:43:50 -06:00
Ryan Houdek
0a42a0ab1b Merge pull request #3428 from Sonicadvance1/proper_glextensions
Make GLExtensions no longer require slghtly modified GL headers
2016-01-06 15:24:47 -05:00
Chris Burgener
bfcf7c791c Add ffmpeg externals 2016-01-05 18:00:41 +01:00
Ryan Houdek
73d4cf6361 Remove our modified GL headers. 2016-01-02 10:34:16 -06:00
skidau
cfa925fbbe Updated SoundTouch library to 1.9.2 2015-12-28 23:08:55 +11:00
Scott Mansell
ffb9722f2d Merge pull request #3032 from waddlesplash/dolphin-qt
Lots more minor DolphinQt stuffs.
2015-11-23 21:45:28 +13:00
waddlesplash
2d9c5ce6b3 Externals/Qt: Update to Qt 5.5.0. 2015-11-06 18:39:30 -05:00
Jeffrey Pfau
efb7272396 Externals: Update miniupnpc to API version 14 2015-10-13 23:35:52 -07:00
Tillmann Karras
f70da0e889 mbedTLS: adapt CMakeLists.txt for Dolphin 2015-09-25 03:46:41 +02:00
Tillmann Karras
4bf776792f mbedTLS: add Dolphin-specific vcxproj file 2015-09-25 03:46:41 +02:00
Tillmann Karras
868eab0bf6 mbedTLS: update license overview
They changed their license from GPLv2+ to Apache 2.0.
2015-09-25 03:46:41 +02:00
Tillmann Karras
9872473f70 mbedTLS: add version 2.1.1
PolarSSL has been renamed to "mbed TLS" and version 2.0 dropped backwards
compatibility. This commit adds only the necessary files without any
modifications, so it doesn't compile yet.
2015-09-25 03:11:48 +02:00
Tillmann Karras
3ae092a086 mbedTLS: delete PolarSSL 1.3 2015-09-24 18:31:33 +02:00
Shawn Hoffman
399083ac8a Drop the old msvcrt files. 2015-09-03 06:10:01 -07:00
Shawn Hoffman
92e9a84685 [windows/wxw] Exclude files which don't publish any symbols. 2015-09-03 04:39:04 -07:00
Shawn Hoffman
dfc1f0a87e Patch wxw to compile on vs2015. 2015-09-03 04:38:58 -07:00
Shawn Hoffman
00afa2a328 Patch libusb to compile on vs2015. 2015-09-03 04:38:50 -07:00
Shawn Hoffman
aa7208e270 [windows] Update projects to vs2015. 2015-09-03 04:23:01 -07:00
Jeffrey Pfau
67d0e81cf3 Externals: Update gtest to r733 2015-07-20 22:53:28 -07:00
comex
3243a21573 Update enet to latest master - 5f476546edabdf37509cd3448d1a616f5eca535d
Command I used, for posterity:

for fn in $(cd /usr/src/enet; echo **/*); do if [ -e $fn ]; then cp -a \
/usr/src/enet/$fn $fn; fi; done
2015-06-02 18:42:45 -04:00
Tillmann Karras
2742906015 Externals: add summary of licenses 2015-05-25 13:22:31 +02:00
Jules Blok
522e721830 OGL: Add glClipControl support. 2015-05-22 23:52:20 +02:00
Shawn Hoffman
ad64336137 quiet some warnings which appear on vs2015.
quieted warnings include shadowed variable names and integer extensions.
2015-03-15 19:28:47 -07:00
Shawn Hoffman
64cb3bce35 windows: don't compile with openmp support 2015-03-15 13:48:46 -07:00
Shawn Hoffman
25064fd8f4 remove win32/mixed project configurations.
remove win32 configs from all the externals, so it shouldn't happen again by accident.
2015-03-14 14:07:21 -07:00
Tillmann Karras
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