Matthew Parlane
21fa664c2d
Hopefully fix win32 build issues.
2012-12-31 03:51:34 +13: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
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
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