Commit Graph

200 Commits

Author SHA1 Message Date
gigaherz 4173080028 Because vs2012==vs11 and vs2013==vs12, which is extremely confusing, I renamed the project files to use the full year as the name.
Also fixed some project references to the right filenames.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5764 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-11-27 16:53:36 +00:00
gigaherz 74378ce378 Created vs2013 files based on the vs2012 code, and fixed a small incompatibility between vs2013 and pthreads.
Removed some missing headers from the vs2010 and vs2012 project files that were causing vs to always claim the projects were out of date.
Also removed some other entries for c/cpp files that were disabled but also missing (I did not search exhaustively).


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5763 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-11-27 16:44:32 +00:00
gregory.hainaut 07605941ef gsdx ogl:
* some preliminary work to test/benchmark bindless texture in the future (glsl was not yet updated)
Bindless texture allow to get a GPU texture pointer and then set it directly
to the shader as a basic uniform.
=> no more texture unit selection/validation
=> no more texture validation neither texture hash lookup

3rdparty: update gl header to the latest gl4.4


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5720 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-08-17 08:57:52 +00:00
gregory.hainaut a877395918 gsdx-ogl-wnd: update GL extension file.
Must fix some undefined in windows


git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl-wnd@5637 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-05-20 06:42:17 +00:00
ramapcsx2.code 796bdb8f37 Soundtouch update from 1.5 to 1.71 as per patch from lincolnh_br.
There's been changes in the VS2008 project file which we may want to look at and port to 2010/2012 separately but it builds like this in 2010 here.
I want to wait and see if there's any issues with Linux first, too.
Thanks to lincolnh_br :)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5619 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-04-17 10:46:57 +00:00
ramapcsx2.code 51fc6dbd07 Added Visual Studio 2012 solution files for DEV9ghzdrk and avoided a macro redefinition error in WinPcap when that compiler is used.
VS2008 is harder to do as there is no automatic downgrader tools for the solution files, sorry.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5602 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-03-20 16:34:31 +00:00
ramapcsx2.code e32a18dac4 Added WinPcap to the library of 3rd party includes and made DEV9ghzdrk use them.
WinPcap version is 4.1.2 and only the /include and /lib folders of their developer pack are included.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5599 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-03-20 13:58:00 +00:00
gigaherz 6255f7d8a8 Updated zlib to 1.2.7. I skipped updating the CMakeLists.txt because ours is probably set up to work with the rest of the project.+
This probably doesn't fix anything important.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5573 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-02-24 17:37:17 +00:00
ramapcsx2 fae268b269 One more patch by KrossX:
Should fix the VS2012 project files for when only VS2012 (and not VS2010) is installed.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5557 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-02-12 11:46:36 +00:00
gigaherz c46deeccde Updated portaudio to the svn revision 1885.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5513 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-01-16 18:28:22 +00:00
gigaherz 31f685c490 [VS2012] For some reason when I made the conversion I totally forgot to copy these, and I didn't notice that until yesterday.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5403 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-09-05 18:04:09 +00:00
gigaherz 995f2adbd5 Remove glew from the 3rdparty libs. It's not currently used by any project.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5387 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-08-19 21:06:49 +00:00
gigaherz a21c85266c Make PCSX2 compile with Visual Studio 2012 (3/3): Upgrade the project files and fix a few project names. Update the .sln to point to the right project files.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5384 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-08-19 19:54:12 +00:00
gigaherz 027b7a8b98 Make PCSX2 compile with Visual Studio 2012 (2/3): Copy project files and solution from their vs2010 originals. Not updated yet!
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5383 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-08-19 19:45:56 +00:00
gigaherz 72372c2219 Make PCSX2 compile with Visual Studio 2012 (1/3): Workaround compiler differences that result in compile-time errors.
NOTE: The 'glew' project does NOT build yet, but it will have to be decided how to approach the problem (String literal too long in glew.rc)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5382 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-08-19 19:36:59 +00:00
gregory.hainaut 4f087a6a8e 3rdparty: remove SDL code source (and reduced 3rdparty size by 40%)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5377 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-08-15 10:23:50 +00:00
gregory.hainaut 226b2d63b8 gsdx: remove completely the SDL backend. Let's hope I didn't break too much VS
cmake: take the opportunity to drop the support of 3rdparty compilation. Distributions have got a more recent version of zlib/soundtouch anyway.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5376 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-08-15 10:22:19 +00:00
sudonim1@gmail.com 4f6a842dca Fix SPU2-X linking issues (I sincerely hope).
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5314 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-06-19 03:09:59 +00:00
gigaherz b769a79d22 portaudio (SPU2-X): Last merge from portaudio svn I forgot to include this change (or tell rama to include it), which breaks debug builds of SPU2-X.
Also, "omfg a commit by gigaherz!"

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5295 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-06-17 01:32:04 +00:00
gregory.hainaut 300ea42977 gsdx-ogl: sync from trunk 5179:5091
git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl@5180 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-04-26 19:51:07 +00:00
ramapcsx2 28de2a04c6 SPU2-X:
Update Portaudio to revision 1826. Hope the Linux side is fine :p

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5153 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-04-09 12:36:18 +00:00
gregory.hainaut 0ad5982364 gsdx-ogl: linux only (merge from trunk 5022:5068)
git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl@5069 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-01-15 14:51:49 +00:00
gigaherz 5483473da0 portaudio: Updated codebase from svn 1748 to svn 1802.
Notable changes:
 - Changes to buffer size calculations and latency calculations.

Not a big update, just wanted to commit something before the year ended!


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5023 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-12-27 17:42:18 +00:00
gregory.hainaut 133847e8a2 gsdx-ogl:
* Properly allocate/delete opengl object
* Request a debug context in SDL, add some code to log opengl error 
* Fix context creation. For the moment only request ogl4.1 (AMD does not support yet 4.2 and it needs libglew1.7 too...)


git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl@4973 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-11-26 11:46:51 +00:00
gregory.hainaut b19e31a1be cmake: fix some linking issue with gold linker (AFAIK only fedora use it for the moment)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4913 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-09-06 19:07:55 +00:00
gigaherz 4e762692da portaudio: Update codebase from svn 1723 to svn 1748.
Notable changes:
 - fixed latency calculations for some modules
 - improved stability of the internal ringbuffer
 - added float32<->uint8 sample conversion

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4911 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-09-05 22:05:14 +00:00
gregory.hainaut e55da1ab04 pcsx2: implement theading name on linux.
onepad: properly connect the latest button
sdl: do not compile some useless files (which fail to compile on my system btw)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4879 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-27 10:38:02 +00:00
gregory.hainaut 783f600711 gsdx, sdl: cast window as expected by sdl
onepad: add an option to control forcefeeback level
cmake: add an hidden option (SHARED_SDL) to build SDL as a shared library to allow pre-load


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4873 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-20 12:17:47 +00:00
gregory.hainaut d8b4c7ccc5 debian: cherry pick micove ppa improvement. Thank very much.
cmake: shutup some warning (mostly sdl...)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4870 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-14 14:38:26 +00:00
gigaherz f2bc219425 SPU2-X: Removed the std::vector I used out of lazyness. The config dialog should no longer keep an ever-growing list of devices, and it has less potential side-effects if somehow the portaudio device list changes while the dialog is open.
3rdparty/portaudio: Removed debug prints on release targets.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4853 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-08 13:59:19 +00:00
gigaherz cb74fd2c10 3rdparty/portaudio: Updated to a slightly newer revision of portaudio, sicne the fixes in it seemed interesting enough.
I also enabled WDMKS backend, but I had to change some #defines to get it to compile, and I can't seem to be able to use it on my Win7 machine. If anyone on XP wants to try it, it will be at their own risk. (use WDMKS hostApi name on the .ini)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4850 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-07 12:40:25 +00:00
gigaherz bb0100deea I went and copypasted the one line I typoed.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4848 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-07 01:55:44 +00:00
gigaherz 1886affc54 3rdparty/portaudio: Fixed portaudio not finding any device because there wasn't any API enabled. The new toggle system requires the compiler to specify the enabled APIs, instead of assuming default-on.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4847 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-07 01:53:24 +00:00
gigaherz 1d8e159433 3rdparty/portaudio: Fixed the build with vs2008 (I hope). I commited the wrong .vcproj file. Reverted to the previous one and updated the file with the same changes I did to the vs2010 .vcxproj
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4846 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-07 01:15:49 +00:00
gigaherz dabe415929 3rdparty/portaudio: Fixed the build (windows). Somehow it compiled in devel/release, but not in debug. Should have failed in both of them though...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4845 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-07 00:58:00 +00:00
gigaherz 5a3cd8e57e 3rdparty/portaudio: Updated portaudio to the march 26 stable release (svn rev 1647). Too many changes to list here.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4844 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-08-07 00:50:05 +00:00
gregory.hainaut@gmail.com 35b9dfce3f pcsx2: zzogl:onepad: gsdx: merge linux-gsopen2 branch (4730) into trunk
* Gsopen2 support for GS plugins => Support of the PCSX2 GS window configuration panel. Support of all PCSX2 shortcut.
* new shortcut: shift-f12 to stole the input. ZZogl shortcut must be prefixed with ctrl
* onepad: Support/fix/improve of configuration gui, multiple key, mouse/wiimote for analog joystick, dualshock3/sixaxis (basic), dual pad and experimental forcefeedback

Note: it is advices to delete OnePAD.ini


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4731 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-06-12 14:48:36 +00:00
gregory.hainaut@gmail.com daa5a00a98 3rdparty: remove the heavy (+90MBytes) SDL test directory. Completely useless and save us few minutes of download
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4712 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-06-05 09:57:49 +00:00
sudonim1@gmail.com ae31701a62 Reverted some of the deletions from r4669. I didn't think too hard about deleting pch files but these are not precompiled headers.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4672 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-05-25 02:09:36 +00:00
sudonim1@gmail.com a7c93c75fb Remove some compiled files. Compilation may temporarily be broken in a trivial way (or might not), I don't currently have visual studio installed.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4669 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-05-24 21:47:52 +00:00
ramapcsx2 b5aad0ea06 Committing changes to the MSVC 2010 build system as posted in issue #977.
Thanks for this nice patch, debian.micove :)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4466 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-03-21 21:51:50 +00:00
gregory.hainaut@gmail.com 2e6951d102 cmake: sdl and gsdx (experimental)
Note: pad plugins crash when linked with sdl 1.3.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4381 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-03-01 19:26:27 +00:00
gregory.hainaut@gmail.com 4bd5322dc6 cmake: WIP to build sdl and GSdx
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4373 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-26 20:02:22 +00:00
gregory.hainaut@gmail.com e646f0a21c 3rdparty wxwidget: Backport a fix from wx2.9. It allows to translate the "broswe" string in some places
Note: on linux the string does not appear (current directory instead).


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4370 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-26 12:30:48 +00:00
arcum42 9d26ae1241 GSdx: A bit more work on the Linux dialog box.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4369 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-26 05:19:18 +00:00
arcum42 2b885abde9 SDL: Add a separate linux config file, so we don't have to keep switching it between Linux and Windows when building.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4368 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-26 03:50:18 +00:00
arcum42 49568c3d85 GSdx: Correct the sdl library output name, and add sdl to the main codeblocks workspace.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4366 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-26 03:05:31 +00:00
gabest11 bc6060d318 GSdx: just updating visual studio project files (redundant settings, broken x64 compilation, etc.)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4350 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-24 04:55:35 +00:00
gabest11 c2e7e4a2fb GSdx: SDL_assert.h fixed for vs2008.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4349 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-23 23:40:37 +00:00
gabest11 e7cc739f56 GSdx: I'm restoring the original SDL_config.h, it broke the windows build. No idea how to proceed under linux, letting it use its own window works, trying to use the one provided by pcsx2 does not. Could be a multi-threading problem with X, or not using a top-level handle. Just guessing.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4345 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-23 06:02:04 +00:00