Commit Graph

54 Commits

Author SHA1 Message Date
Jonathan Li efb5c85c76 3rdparty:portaudio: Fix module omission in Devel builds
Preprocessor defines were set for Release and Debug modes, but not Devel
builds. Broken since 259a39ef0c.

Fixes #1505.
2016-08-08 23:01:28 +01:00
Jonathan Li 97e268e5a5 3rdparty: Tidy/standardise VS projects
Combine all the different configurations together so the project files
are more generic and maintainable.

Also standardise the layout so all the project files will be similar and
all have the same standard elements (even if empty).

Add 64-bit configurations.

Additional specifics:
wxWidgets: Common stuff into the property sheets.
pthreads: Fixes the LNK4068 warning.
portaudio: Devel config added.
libjpeg: Non-existent file removed.

Side note: libjpeg is barely used - wxWidgets uses it but doesn't have
to, ZeroGS uses it but we don't develop that anymore.
2016-07-19 23:25:12 +01:00
Jonathan Li b20433c0be windows: Remove user.props references from all projects
find . -name *.vcxproj -exec sed -i -e '/user.props/d' {} \;

Microsoft recommends against using .user files. From
https://msdn.microsoft.com/en-us/library/669zx6zc.aspx :
"The best practice is to delete the reference to them in Property
Manager to ensure that your projects operate independently of any
per-user, per-computer settings. This is important to ensure correct
behaviour in a SCC (source code control) environment."

If you cannot compile SPU2-X after this commit (since that still relies
on the old DirectX SDK), you'll need to fix your build environment.
2016-05-29 12:21:52 +01:00
Jonathan Li 9ed9b2d8cd windows: Switch to DefaultPlatformToolset aka non-XP toolsets
Basically I ran
find . -name "*.vcxproj" -exec sed -i -e 's/_xp//' {} \;

This will likely break XP, but it paves the way on Windows for a PCSX2
that does not require the DirectX redistributables to be installed for
Windows 8, 8.1 and 10 users. Windows Vista and 7 users will still require
the DirectX redistributable files for XInput and XAudio, though PCSX2
should still be capable of running if a user does not actually use either
of them.
2016-03-13 12:04:28 +00:00
Miguel A. Colón Vélez a1de0614d7 Remove vs2012 files.
It does not support several things from C99/C++11 that are
used in the project.
2015-08-18 01:15:51 -04:00
Miguel A. Colón Vélez 277217353e Rename files. 2015-08-18 00:44:35 -04:00
Miguel A. Colón Vélez 1fe5aceded Enable round-tripping.
- Remove ToolsVersion
- Use $(DefaultPlatformToolset)_xp until XP support is dropped.
Note: opencl had no XP support and was not enabled in VS2012.
2015-08-18 00:44:19 -04:00
Miguel A. Colón Vélez 2c4cda1e0a Use Unicode in portaudio. 2015-08-07 14:28:02 -04:00
Miguel A. Colón Vélez 44bb093438 Run update_svnrevision.sh. 2015-08-07 06:06:36 -04:00
Miguel A. Colón Vélez 5a860d87c7 Merge back the local changes. 2015-08-07 05:57:35 -04:00
Miguel A. Colón Vélez c17667971c Update portaudio to svn1954. 2015-08-07 05:53:01 -04:00
Miguel A. Colón Vélez 6462393aaf Introduce end-of-line normalization
Signed-off-by: Gregory Hainaut <gregory.hainaut@gmail.com>
2015-08-04 23:52:48 +02:00
Gregory Hainaut dd5868f9ba Also remove file of 3rdparty 2015-06-04 08:56:19 +02:00
Gregory Hainaut 532cc7755c cmake: remove cmake from 3rdparty
3rdparty have been deprecated since a long time on linux.

Files are likely wrong
2014-12-20 10:54:18 +01:00
gigaherz 888f0a27da Remove vs2008 project files, since they have become outdated, and complicated to maintain.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5902 96395faa-99c1-11dd-bbfe-3dabce05a288
2014-02-15 18:24:06 +00:00
gigaherz 01daa0b6fd Change the vs2012 project files to use the v110_xp platform toolset, and the vs2013 project files to use the v120_xp platform toolset, so that the resulting executables can be run in Windows XP/2003.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5822 96395faa-99c1-11dd-bbfe-3dabce05a288
2014-01-24 15:30:34 +00:00
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
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 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
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
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
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
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
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
gigaherz 3f1e272d27 I was bored tonight so I updated the embedded portaudio to the latest svn. It has some fixes for everyone, check portaudio's svn log from 1541 to 1570 for details.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4272 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-01-28 21:06:02 +00:00
gigaherz d61d46bd7b Sync with portaudio r1541 at rama's request.
Too many changes to list here, check portaudio svn log from r1505 to r1541 if you are curious.
Hope it works fine.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3879 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-05 20:52:42 +00:00
Jake.Stine 5b80fc6c68 Disable LTCG on wxCore, wxAdv, zlib, libjpeg, and the x86Emitter. Slices Release mode build times by more than half and shaves 200K- off the .exe size. (I really should have done this sooner)
DEV NOTE: Please leave LTCG enabled on wxBase, since wxString/wxObject and other wx-based containers benefit from it considerably.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3172 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-06-05 15:41:40 +00:00
gigaherz 5a97b9dd08 Portaudio: sync with portaudio /trunk up to revision 1505 (mostly linux stuff).
----
Revision 1505: wasapi: 
 - implemented support of non-Interleaved buffers (paNonInterleaved) for WASAPI blocking interface for input and output
 - blocking methods will now use PA sample converters
Revision 1504: alsa: - releasing memory of non-MMAPed buffer on stream closure by Pa_CloseStream
Revision 1503: alsa:
 - reverted buffer size (2048) hardcoding for non-MMAPed devices to avoid crash on wrong buffer size usage (whole area requires more work)
 - optimized non-MMAPed device operation to avoid malloc(memset)/free usage on every processing call avoiding significant performance penalty
Revision 1502: alsa:
 - fixed deadlock in PaAlsaStream_WaitForFrames if device is paused, poll() results are now checked for 0 and if 64 times exceeded an error (paTimedOut) is returned
 - removed hardcoded low-limit of latency for non-MMAPed devices, it is an obligation for user to set an acceptable/desired latency value
 - tuned XRUN recovery sequence for MMAPed devices
Revision 1501: fixed compile for DirectSound implementation under MSYS, missing DSSPEAKER_7POINT1_SURROUND define


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3133 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-31 19:51:53 +00:00
gigaherz 1884c409e1 Update portaudio to the latest snapshot. It seems to have some improvements on sample conversion, WASAPI and ASIO.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3050 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-20 16:56:53 +00:00
Jake.Stine 555b409f8b portaudio: minor MSVC project fix; the lib file was being generated outside the deps folder.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3048 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-20 15:11:52 +00:00
Jake.Stine 9b4239d81a SPU2-X: Fix compilation errors under windows, and remove the /LTCG warnings when building Devel targets.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3023 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-16 01:03:52 +00:00
ramapcsx2 7e8c22b4f5 Committing "blood's" work on building PCSX2 and plugins under msvc 2010.
Changes: Fixed all compile errors in VS 2010. Added support for new w32pthreads.v4. Fixed all MSB8012 warnings. Fixed LNK419 warnings with /DELAYLOAD. Fixed issues when compiling Devel before Release. Added GSdx Devel target. Minor cleanups.

Thanks a bunch, blood :)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2930 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-30 19:46:43 +00:00
sudonim1 4457fe40fc Removed all trailing whitespace in *.c *.cpp *.h because it irritates me.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2897 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-25 00:31:27 +00:00
sudonim1 a05e9c62be Set svn:eol-style=native on all *.c *.cpp *.h
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2894 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-24 21:37:39 +00:00
gigaherz a3ca69a620 Made a special .props file for null plugins, since they seem to have a different folder structure than the rest.
Add a ton of missing .props
Tell me if anything else is missing >_<

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2846 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-14 19:57:33 +00:00
gigaherz 954847fca4 Initial work on vs2010 project files for PCSX2 and plugins.
The *null projects don't build, and neither do ZZOgl or ZeroSPU2.
Pcsx2 project has some issues with Resources' custom build steps not being run.
Only Debug target tested.
Needs work before it's usable.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2843 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-14 19:44:04 +00:00
ramapcsx2 86dcb0a1a9 SPU2-X:
Work on support for Wasapi's exclusive mode. Not enabled yet.
Also lower (/8) sound out packet size. Helps the timestretcher 
responsiveness and quality.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2755 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-03-19 20:28:10 +00:00
gigaherz 9984259f1f Portaudio seems to work fine as a static lib, so it seems pointless keeping yet another dll around when it's unnecessary.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2752 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-03-19 14:14:45 +00:00
gigaherz 1d7244d200 Update portaudio to the current v19 development snapshot. It contains a LOT of changes on WASAPI.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2751 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-03-19 14:00:20 +00:00