ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,828 Commits 22 Branches 4,243 Tags 517 MiB
Commit Graph

112 Commits

Author SHA1 Message Date
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 97467f9e30 Merge pull request #579 from PCSX2/drop-vs2010-support 
Drop vs2010 support
 2015-06-06 10:47:16 +02:00
Gregory Hainaut 4feeaac7d1 Merge branch 'alignment' of git://github.com/xsacha/pcsx2 into xsacha-alignment 
Gregory: Get all changes but keep C11 code path which will be the future
 (if someone can find info on Visual Studio support)
* Keep the old posix api to use address sanitizer on gcc 4.9

Conflicts:
	common/build/Utilities/utilities.vcxproj.filters
	common/build/Utilities/utilities_vs2012.vcxproj.filters
	common/build/Utilities/utilities_vs2013.vcxproj.filters
	common/include/Utilities/MemcpyFast.h
	common/include/Utilities/StringHelpers.h
	common/src/Utilities/AlignedMalloc.cpp
	common/src/Utilities/vssprintf.cpp
	plugins/GSdx/stdafx.cpp
 2015-06-05 20:31:14 +02:00
Gregory Hainaut ba5b367ae8 drop support of Visual Studio 2010 
* Severals PR uses C++11 features
* 2015 will soon be released
* Win 10 will soon be released

Time to upgrade
 2015-06-04 08:55:22 +02:00
Miguel A. Colón Vélez c8c22cf6a0 Notify about cross build option upon failure. 
Tell the user to use CMAKE_TOOLCHAIN_FILE upon failure.
.
Cleanup detectOperatingSystem. Should be the same but adding
GNU and kFreeBSD from Debian and filtering out pre OS X Apple.
.
libaio is linux only. Also check for the correct header since
aio.h is the POSIX one. Both are in /usr/include/ anyway.
Only build core if (Linux AND NOT AIO_FOUND) == false.
.
Use Unix for GTK and X11. Macs has gtk-quartzs and xquartz or native X11.
*BSD, linux, etc should have both.
 2015-01-03 14:51:04 +01:00
ramapcsx2 98d22f8b2e Merge pull request #215 from xsacha/memcpy 
Remove some slow, redundant memcpy implementations: memcpy_const/memcpy_...
 2014-09-12 19:57:57 +02:00
Sacha 1d116cc23b Remove memcpy_amd usages from plugins. No more custom implementations in plugins. 2014-08-27 13:50:55 +10:00
Sacha 90e59b2704 Clean up the type defines in pcsx2. 
The non-stdint fallback was not even working which shows that it was never used. No supported platform would not have stdint anyway.
Remove unused code and do not restrict types to Linux and MSVC. Was there a reason for this?
 2014-08-25 16:16:34 +10:00
Sacha 2ba0b1b76b Use posix_memalign and _aligned_malloc for alignment. Remove unused code. 2014-08-17 21:03:43 +10:00
Sacha 7568f6f2ec Remove deprecated jASSUME from pcsx2 core. It is still used in some plugins 2014-08-15 14:32:56 +10:00
Sacha a3bc6a73a3 Remove some horrible old code. 
Remove an assert define and instead use the static_assert that all compilers provide.
As an added bonus, assert messages\!
 2014-08-13 13:55:32 +10:00
Ryan Houdek 3d37a6ce27 Removes the usage of __LINUX__ define 
This is defined and set it a ton of different places.
It's checked in a whole lot more
Instead just use __linux__ like a real project should
 2014-08-03 13:20:36 -05:00
sudonim1 06dfc4e6ef Merge pull request #118 from lioncash/zgs 
Minor changes to ZeroGS
 2014-07-16 18:08:12 +01:00
ramapcsx2 cb9fc6fa3e Merge pull request #100 from lioncash/duplicate-condition 
ZeroGS: Remove a duplicate condition in RenderCRTC
 2014-07-16 18:33:15 +02:00
Lioncash ba0d3d1a6a ZeroGS: Add a missing formatter to a sprintf call 2014-07-14 18:02:22 -04:00
Lioncash b9ff3b6c81 ZeroGS: Explicitly convert the LPVOID buffer to a const char* 
Also make the failure case for one of these log calls a DEBUG_LOG instead
of a printf.
 2014-07-14 18:01:50 -04:00
Lioncash cb5b265dcd ZeroGS: Remove a duplicate condition in RenderCRTC 2014-07-05 14:00:00 -04:00
Lioncash 76796c76cd ZeroGS: Fix a sprintf typo in GSopen. 
This 1000 millisecond specifier was intended for the AddMessage call.
 2014-07-04 21:50:18 -04:00
Gregory Hainaut 37b1d3ae42 codeblock: remove build file => linux is cmake only 
They are completely out-dated. And nobody have time to update them.
 2014-04-11 09:18:31 +02:00
Gregory Hainaut 390245806a cmake: sed /PROJECT_SOURCE_DIR/CMAKE_SOURCE_DIR/ 
The former depends on the project command. Whereas the latter is the true absolute path
of the project
 2014-03-30 16:36:02 +02: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
gabest11 ddaa892726 Removed ATL/MFC dependencies from every project, the free version of visual studio does not have those. It compiles with vs2012 express now, will fix others later, in case they are broken. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5692 96395faa-99c1-11dd-bbfe-3dabce05a288
 2013-07-01 21:28:58 +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
gregory.hainaut f53a062063 license: update the copyrigh address to please linux distribution 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5436 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-10-19 20:27:50 +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 801867ab95 [vs2012] ZeroGS/ZZogl: Also disable SAFESEH for the other targets, not just Debug. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5389 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-08-20 13:01:47 +00:00
gigaherz f724e6fa07 Turn off SAFESEH for ZeroGS and ZZogl. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5386 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-08-19 20:52:19 +00:00
gigaherz c696c40924 ZeroGS/vs2012: "count" is a function in the vs2012's std:: namespace, so it conflicts to use count as a variable when "using namespace std;" is in place. Renamed the two instances of that issue to "counter". 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5385 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-08-19 20:03:47 +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
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
sudonim1 22c1b30ed6 Fixed inconsistent newlines / added as many svn:eol-style=native properties as I could without killing myself. 
Please set up auto-props in your svn client.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4488 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-03-25 05:06:49 +00:00
sudonim1 1445470340 Remove a compiled library which somehow got committed. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4486 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-03-25 04:51:02 +00:00
sudonim1 7d75a5a53b Missed some SPU2-X and all zzogl code in the last commit. 
Fixed assumption that all paths received from pcsx2 end in the path separator.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4484 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-03-25 01:09:18 +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
arcum42 5e73b1ca7e GregsMisc: Sync with trunk (r3983-r4044) 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@4045 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-11-23 03:11:08 +00:00
arcum42 d49a34a44f GregMiscellaneous: zerogs: Revert an accidental change to zerogs... 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3962 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-23 08:22:32 +00:00
arcum42 465dd47bde GregMiscellaneous: zzogl-pg: Give VB its own header. Some changes to the Kick functions. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3961 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-23 08:15:39 +00:00
arcum42 b0cd667fd6 GregMiscellaneous: zzogl-pg: zerogs.h is now only included by zerogs.cpp. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3937 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-18 11:24:40 +00:00
gregory.hainaut 83604ec59d cmake: properly separate ldflags from cflags 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3567 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-25 14:20:03 +00:00
gregory.hainaut 4e90b10c76 cmake: Use same variable name for output. Allow easier copy-paste between files. Do not know why I did not do it earlier. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3566 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-25 13:54:26 +00:00
gregory.hainaut b326504054 [cmake] 
* Major rework of the linker flags. Use some globals flags for -s and -m32
  Add a USER_CMAKE_LD_FLAGS variable. Easier to play with advanced link flags for future gcc version (>=4.5)
* Remove useless stub file
[debian]
* minor dependency fix


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3475 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-13 09:16:13 +00:00
gregory.hainaut 0e9030689c [copyright] * second round of bad FSF postal address. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3428 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-08 16:34:39 +00:00
Jake.Stine c3f2320994 GSdx and some other plugins no one cares about: remove ddraw.lib. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3296 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-25 02:36:21 +00:00
gregory.hainaut 6055ca126b * Grunt work :) Use variables to set flags to ease futur modifications 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3146 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-03 15:12:29 +00:00
arcum42 9baed432c9 cmake: A bunch of 32 bit/64 bit stuff. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3022 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-05-16 00:36:42 +00:00
arcum42 b363b7c715 cmake: Change the way stripping is handled. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3021 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-05-16 00:12:10 +00:00