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
Matthew Parlane
21fa664c2d
Hopefully fix win32 build issues.
2012-12-31 03:51:34 +13:00
Matthew Parlane
13bd235c11
Merge branch 'master' into wii-usb
2012-12-29 17:47:52 +13:00
Ryan Houdek
e2489196e4
Got overzealous. We aren't removing CG quite yet with this branch.
2012-12-26 00:41:25 -06:00
Ryan Houdek
f4e7a280a9
Remove cg.lib from some files for Windows and renaming a function.
2012-12-26 00:07:43 -06:00
Matthew Parlane
c626d5aae3
Move to 1.0 libusb.
2012-12-24 08:31:50 +13:00
Matthew Parlane
d8b879a4ee
Movd back to libusb for full support on windows
2012-11-15 01:09:25 +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
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
2ab2afaa1f
update portaudio to stable_v19_20111121 and fix linker warnings
2012-03-18 07:50:37 -07: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
aff6a7ac6f
WIP patch for networking
2012-01-05 02:59:47 -08: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
82b635b799
vs2010: build dsptool again
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7681 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-07-17 08:38:08 +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
