59bf761f87
Merge pull request #5551 from shuffle2/msbuild-qt-tidy
...
msbuild/qt: remove .qrc and .ui file support
2017-06-05 18:49:33 -07:00
0db59c71f6
msbuild/qt: remove .qrc and .ui file support
2017-06-05 11:50:28 -07:00
ae3c8a4be9
msbuild: update to Qt5.9.0
2017-06-05 11:44:21 -07:00
c02eb27fd5
msvc: use 8 byte struct member alignment instead of 16
2017-06-03 18:37:36 -07:00
2a01945cf4
msbuild: remove /EHa for wxw, which was just an old warning workaround
2017-06-03 18:20:41 -07:00
7539259fb9
msbuild: EnableFiberSafeOptimizations is an opt. inhibitor; disable it.
2017-06-03 18:20:41 -07:00
4f0c2df8a1
msbuild: wxw does not need xxhash to build
2017-06-03 18:20:41 -07:00
7431dd3dce
msbuild: make Externals inclusion methods uniform
2017-06-03 18:20:41 -07:00
9ea7031042
msvc: add /Zc:throwingNew
2017-06-03 18:20:41 -07:00
0d1324af50
msvc: use pretty compiler diagnostics
2017-06-03 18:20:41 -07:00
7537f8b861
clarify a little in Base.props
2017-06-03 18:20:40 -07:00
c251311b02
DolphinQt: remove I_AM_BUILDACUS as the buildbot doesn't use it anymore
2017-06-03 18:20:40 -07:00
ddae5058e9
msbuild: increment other version numbers to vs2017 equivalents
2017-06-03 18:20:39 -07:00
076d3cd639
enable latest C++ Standard features (/std:c++latest)
2017-05-28 13:37:33 +02:00
0fcc625b56
clean up Base.props
...
/permissive- automatically enables /Zc:rvalueCast and /Zc:strictStrings
2017-05-28 13:37:32 +02:00
ec8f6e6d26
enable MSVC Standards Conformance (/permissive-)
2017-05-28 13:37:31 +02:00
34ad1eb547
Externals: remove PortAudio
2017-05-27 18:28:57 -07:00
17f4413143
Externals/cubeb: add Visual Studio build files
2017-05-27 18:28:56 -07:00
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
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
3ca03373ae
MSVC: define HAVE_FFMPEG
2017-05-26 00:53:58 -07:00
68b1f8ec05
Base.props: Add /utf-8 compiler option.
...
This ensures Dolphin can be built correctly on systems with non-Latin codepages.
2017-05-04 18:03:41 +02:00
366aeeb488
Make ENABLE_ANALYTICS=0 do something
2017-04-26 23:27:13 +02:00
d244597b42
Merge pull request #4408 from leoetlino/usb
...
IOS: USB support (OH0, USB_VEN, USB_HID)
2017-02-07 09:17:05 +13:00
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
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
0baf1c78c0
vs: Move defines out of Common.h to the build system
2017-01-24 03:55:46 +01:00
59a17db6c4
Add a __LIBUSB__ define
...
This allows us to only check if __LIBUSB__ is defined, which is cleaner
than checking for __LIBUSB__ and _WIN32.
2016-10-03 21:07:12 +02:00
699a90a7b4
Windows: Don't include Externals\curl\lib\ everywhere
2016-06-21 10:58:50 +02:00
c4f5c471bb
Externals: Add libcurl.
2016-06-18 18:31:40 +02:00
ca31c62c01
exchange XSaveWorkaround (which was fixed in VS2015) for ucrtFreadWorkaround (which was broken in VS2015).
2015-10-16 20:26:34 -07:00
a6f04b0e15
Merge pull request #3091 from Tilka/mbedtls
...
Update mbed TLS (PolarSSL)
2015-10-03 18:00:58 -07:00
ac5f56df7e
mbedTLS: adapt Dolphin's Visual Studio files
2015-09-25 03:46:41 +02:00
c781123db7
QtCompile.props: Update for Qt 5.5.
2015-09-12 18:58:14 -04:00
9b56efe57c
Revert "Base.props: Remove DXSDK_DIR from the include path."
...
This reverts commit bea3054c9c
2015-09-03 04:23:02 -07:00
bea3054c9c
Base.props: Remove DXSDK_DIR from the include path.
...
By overriding the include directories we can ensure we only use the Windows SDK.
2015-04-13 21:44:40 +02:00
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
64cb3bce35
windows: don't compile with openmp support
2015-03-15 13:48:46 -07:00
a5ea6c6e93
enet: fix Visual Studio files
2015-03-02 22:20:37 +01:00
c54a8c54fb
Merge pull request #1994 from Tilka/vtune
...
JitRegister: fix VTune integration
2015-02-22 07:58:12 -08:00
0ec48e0ec9
JitRegister: fix VTune integration
2015-02-12 02:14:49 +01:00
4fa38f0c02
Externals: update libusb to version 1.0.19
2015-02-12 01:04:43 +01:00
3aa3002010
Fix Intellisense error spam on Visual Studio.
...
Intellisense doesn't like defines in PCH files, and it doesn't like the deleted
constructor for BitField. (I think it's being overly strict about the
"must have no non-default constructors" rule for classes in unions.)
2015-01-23 19:15:25 -08:00
402fb4bd20
xxhash: Add cmake + VS files
...
Based on riking's PR.
2015-01-21 07:35:34 +01:00
33634b6489
windows: use qt 5.4.0
2014-12-13 20:59:40 -08:00
a93f86330e
Port dolphin to SFML 2.1
2014-11-25 16:44:38 +00:00
9fe2d45ad4
Fix QtCompile.props to work if the repo path contains spaces.
2014-09-27 23:08:18 -07:00
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
9d57ac68a4
Add Qt submodule for windows.
2014-09-15 15:07:42 -07:00
ae3a5ce9e3
Qt: Add msvc support
2014-09-15 15:07:33 -07:00
ffe6bcf22f
VSProps: Add C4351 to the list of disabled warnings in Base.props
2014-09-03 23:07:19 -04:00
839cace5ff
msvc: get UnitTests compiling
...
Choose it from VS or pass /p:RunUnitTests=true to msbuild
2014-09-01 21:27:45 -07:00
266992684d
msvc: remove some remnants of SDL and DSound from projects and general cleanup.
2014-09-01 21:27:44 -07:00
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
a9c33075f2
msvc: enable compiler warnings as errors.
2014-08-19 22:33:49 -07:00
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
9df2127865
msvc: enable strictStrings solution-wide for release.
...
strictStrings is not supported by debug libraries, and indeed breaks the build.
Drop wbemidl.h (incompatible with strictStrings) dependency by using SDL-style search for XInput GUIDs.
2014-08-19 20:33:24 -07:00
8c81ea0aad
Windows: Enable /Zc:rvalueCast solution-wide.
2014-08-18 00:04:31 -07:00
8801289149
Windows: Add /Zc:inline to compiler options.
2014-08-15 01:17:10 -07:00
f1b82a34b2
Windows: Use a shared precompiled header for dolphin code under Source/
2014-08-14 23:51:13 -07:00
5eccc08c7e
Use official flag for detailed symbols. Require VS2013 with update 3 or later to build.
2014-08-10 14:47:29 -07:00
a70fad4dcb
Removes x86_32 from Visual Studio Base properties.
2014-08-03 13:48:53 -05:00
8b13afbb8e
Remove the 32-bit config platform from the VS solution and projects
2014-06-24 22:07:26 -04:00
58bcc3d12a
Redo commit 932945d480
...
This time, make sure the object for disabling XSave support in msvcr can't be dropped by the linker.
2014-05-27 13:41:19 -07:00
8995d299f2
windows: move arch defines to base.props
2014-03-06 14:37:40 -08:00
eee549f92b
Scope the Windows include directory to only point to Source/Core/.
...
Also fix the Windows build with this change.
2014-02-18 13:21:12 -05:00
2afe215271
Convert all includes to relative paths.
2014-02-18 02:19:10 -05:00
eba0c21b5a
[GLExtensions] Fix Windows build.
...
Conflicts:
Source/VSProps/Base.props
2014-01-17 16:04:05 +01:00
34692ab826
Remove unnecessary Src/ folders
2013-12-31 14:03:19 -05:00
43e618682e
Convert all vcxproj files to UNIX line endings
2013-12-31 14:03:18 -05:00
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
55e8be595c
Fix "Entry Point Not Found crash on Windows Vista"
...
Fixes issue 6805.
https://code.google.com/p/dolphin-emu/issues/detail?id=6805
2013-12-08 18:01:49 -05:00
7e9b970240
Use libpng for saving images.
...
TODO: Needs threading done similiar to OGL backend.
Fixes issue 6779.
2013-11-14 21:02:49 +13:00
f4056978c8
[windows] update SDL-2.0.0 to 2.0.1. Fixes issue 6793.
2013-11-04 23:50:52 -08:00
dab9af43a4
[Windows] Add missing dlls and enable OpenMP support.
2013-11-03 11:54:45 +13:00
e22ff4927a
Revert "Add dxsdk_dir to vc++ paths via base.props. This means you no longer need the paths in a global property sheet. In fact if you have them in such a file, you should remove them as it will cause conflicts with the vs2013 build."
...
This reverts commit 0791a9ef80
2013-11-02 09:24:56 +13:00
82729fcc8f
Merge remote-tracking branch 'shuffle2/vc12'
...
Conflicts:
Source/Core/Common/Common.vcxproj
Source/Core/Common/Common.vcxproj.filters
2013-10-31 16:51:56 -04:00
0791a9ef80
Add dxsdk_dir to vc++ paths via base.props. This means you no longer need the paths in a global property sheet. In fact if you have them in such a file, you should remove them as it will cause conflicts with the vs2013 build.
2013-10-27 00:48:53 -07:00
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
d261dfaf46
Upgrade libusb to 1.0.16
2013-09-30 18:36:54 +13:00
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
fede38985e
Replace OpenSSL with PolarSSL
...
Works on windows, not yet cmake.
2013-08-15 20:47:47 +12:00
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
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
1b8d044543
clear cg from project files
2013-02-27 10:55:25 +01:00
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
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
21fa664c2d
Hopefully fix win32 build issues.
2012-12-31 03:51:34 +13:00
13bd235c11
Merge branch 'master' into wii-usb
2012-12-29 17:47:52 +13:00
d7f43c7a68
remove cg from windows project files
2012-12-28 01:08:29 +01:00
67c1c6b062
Merge branch 'GLES-software'
2012-12-26 12:54:58 -06:00
e2489196e4
Got overzealous. We aren't removing CG quite yet with this branch.
2012-12-26 00:41:25 -06:00
f4e7a280a9
Remove cg.lib from some files for Windows and renaming a function.
2012-12-26 00:07:43 -06:00
f6418bd093
Merge branch 'master' into wii-usb
2012-12-24 12:58:15 +13:00
c626d5aae3
Move to 1.0 libusb.
2012-12-24 08:31:50 +13:00
832a5a0b26
Add the resource include in only one place for all builds.
2012-12-16 23:39:05 -06:00
d8b879a4ee
Movd back to libusb for full support on windows
2012-11-15 01:09:25 +13:00
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
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
f7423a0a4f
Merge branch 'master' into wxw3-update
...
Conflicts:
Source/Core/DolphinWX/Src/LogWindow.cpp
2012-03-22 17:57:38 -07:00
shuffle2