ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,528 Commits 21 Branches 4,158 Tags 488 MiB
Commit Graph

44 Commits

Author SHA1 Message Date
Gregory Hainaut 67c3587c0b cmake: fatal error if miss dependencies in package mode 
+ don't install lilypad in package mode (not ready for distribution)
 2015-08-10 08:49:55 +02:00
Gregory Hainaut 979ea92754 gsdx: make png++ optional 
Some distributions (Fedora) doesn't have a png++ package...
 2015-06-04 20:22:05 +02:00
Gregory Hainaut 5c046180a1 cmake: properly add detection of lzma 
Code is 100% optional.

Code will allow be enabled if lzma-dev is installed at compile time
 2015-05-17 22:08:10 +02:00
Gregory Hainaut 8cd533304c gsdx: new dependency on linux => png++ 
Note: it is only header file that wrap the standard png (which was
already mandatory for wx/sdl)
 2015-05-16 12:47:28 +02:00
Gregory Hainaut 88a714327a linux-zzogl: don't build anymore zzogl by default 
Sadly, no time to maintain it neither to improve it.

Note: I think new openGL 4.x feature would make the plugin faster

Anyway, now GSdx-ogl is probably better than zzogl
 2015-05-14 17:38:42 +02:00
Gregory Hainaut cb6e8a7d6a gsdx-linux: Don't enable EGL by default 
I was hoping that EGL become a standard much more faster. Currently it is an useless dep
so let's disable it by default.
 2015-05-11 15:33:40 +02:00
Gregory Hainaut 7985f5114c cmake: enable lilypad 
I manage to have x/start button working with 0/1 key. Here the reference configuration.

[General\ Settings]
Force\ Cursor\ Hide=0
Mouse\ Unfocus=0
Background=0
Multiple\ Bindings=0
DirectInput\ Game\ Devices=0
XInput=0
DualShock\ 3=0
Multitap\ 1=0
Multitap\ 2=0
Escape\ Fullscreen\ Hack=0
Disable\ Screen\ Saver=0
Logging=0
Save\ State\ in\ Title=0
GH2=0
Turbo\ Key\ Hack=0
Vista\ Volume=0
Close\ Hacks=0
Keyboard\ Mode=16
Mouse\ Mode=0
Volume=0
[Pad\ 0\ 0]
Mode=1
Auto\ Analog=0
[Pad\ 0\ 1]
Mode=1
Auto\ Analog=0
[Pad\ 0\ 2]
Mode=1
Auto\ Analog=0
[Pad\ 0\ 3]
Mode=1
Auto\ Analog=0
[Pad\ 1\ 0]
Mode=1
Auto\ Analog=0
[Pad\ 1\ 1]
Mode=1
Auto\ Analog=0
[Pad\ 1\ 2]
Mode=1
Auto\ Analog=0
[Pad\ 1\ 3]
Mode=1
Auto\ Analog=0
[Device\ 0]
Display\ Name=displayName
Instance\ ID=instanceID
Product\ ID=deviceID
API=16
Type=1
Binding 0=0x00040030, 0, 31, 65536, 0, 0, 0
Binding 1=0x00040031, 0, 19, 65536, 0, 0, 0
Binding 2=0x00040002, 0, 50, 65536, 0, 0, 0
Binding 3=0x00040003, 0, 51, 65536, 0, 0, 0
Binding 4=0x00040004, 0, 52, 65536, 0, 0, 0
Binding 5=0x00040005, 0, 53, 65536, 0, 0, 0
Binding 6=0x00040006, 0, 54, 65536, 0, 0, 0
Binding 7=0x00040007, 0, 55, 65536, 0, 0, 0
Binding 8=0x00040008, 0, 56, 65536, 0, 0, 0
Binding 9=0x00040009, 0, 57, 65536, 0, 0, 0
Binding 10=0x0004000C, 0, 58, 65536, 0, 0, 0
Binding 11=0x0004000D, 0, 59, 65536, 0, 0, 0
Binding 12=0x0004000E, 0, 60, 65536, 0, 0, 0
Binding 13=0x0004000F, 0, 61, 65536, 0, 0, 0
Binding 14=0x00200010, 0, 62, 65536, 0, 0, 1
Binding 15=0x00200011, 0, 63, 65536, 0, 0, 1
Binding 16=0x01020012, 0, 33, 65536, 0, 0, 13172
Binding 17=0x02020012, 0, 35, 65536, 0, 0, 13172
Binding 18=0x02020014, 0, 39, 65536, 0, 0, 13172
Binding 19=0x02020015, 0, 38, 65536, 0, 0, 13172
 2015-02-20 23:05:21 +01:00
Gregory Hainaut 2471306fc4 cmake: actually onepad requires X11 2015-02-20 23:05:21 +01:00
Gregory Hainaut 0346da2fa0 cmake: both zzogl and gsdx require gtk 
Actually everything require GTK
 2015-01-04 19:54:05 +01: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
Gregory Hainaut d00666a4d9 cmake: regression to select SDL/GTK + 64bits fix 2014-12-22 19:31:32 +01:00
Gregory Hainaut 63ba78b664 remove zzogl-pg-cg 
superseeded by zzogl-pg
 2014-12-13 12:28:37 +01:00
Gregory Hainaut 0a4f9e43d9 cmake: clean sdl management 
* sdl is mandatory for spu2x
* cmake will include either /usr/include/SDL or /usr/include/SDL2 so no
  need to add extra ifdef
 2014-12-07 21:06:21 +01:00
Gregory Hainaut c945aead54 cmake: better support of SDL2 
Description: Building with SDL2_API=TRUE is incomplete
 SDL_FOUND does not imply SDL2_FOUND
 Use check_libs for detection
 Only include ${SDL_INCLUDE_DIR} when needed
 Use SDL2_LIBRARIES
Author: Miguel A. Colón Vélez

Gregory: add back SDL_BUILDING_LIBRARY
 2014-12-07 12:19:14 +01:00
Gregory Hainaut 0706564215 remove sparsehash from 3rdparty 
small deps but the less the merrier

Note: could someone check windows builds :p
 2014-07-29 21:06:31 +02:00
Gregory Hainaut c37d9c10f7 cmake: git compilation issue + useless warning message 
* avoid compilation failure when git -C isn't supported
* don't print missing dependency when EXTRA_PLUGINS isn't activated
* sed /endif(.*)/endif/ because I don't like it
 2014-04-17 20:26:16 +02:00
Gregory Hainaut 414ce3589a cmake: new option -DEXTRA_PLUGINS=TRUE|FALSE 
--extra for ./build.sh script

By default only build the pricipal plugin: GSdx|zzogl/spu2-x/onepad/UsbNull/Dev9Null

Extra plugins are: GsNull|zzogl-cg/Spu2Null|zerospu/PadNull

The purpose is to improve compilation time on linux
 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
gregory.hainaut 4934e43287 gsdx ogl: in case of EGL_BAD_MATCH try to create the context with different option (hope to fix intel mesa) 
cmake: add sdl as a dependency requirement of spu2x


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5732 96395faa-99c1-11dd-bbfe-3dabce05a288
 2013-10-05 10:37:48 +00:00
gregory.hainaut 9b037a3813 pcsx2: increase a bit the minimum size of the plugin dialogs (GSdx name is too long) 
gsdx:
* move gl function loading into GSwnd. Clean the header and avoid to rely on macro.
* Always require libegl for GSdx. You still need to select the API at compilation.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5670 96395faa-99c1-11dd-bbfe-3dabce05a288
 2013-06-16 08:43:50 +00:00
gregory.hainaut 43fb0a9a5e linux various: 
* Try to launch dev/debug version when pcsx2 isn't found
* remove svn metadata from the linux tarball
* Add libaio on the cmake dependency message


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5624 96395faa-99c1-11dd-bbfe-3dabce05a288
 2013-05-01 16:02:11 +00:00
gregory.hainaut db1cd9a5c5 async-iso: 
* add cmake plumbing for libaio
* add Native EOL style on cmake file


git-svn-id: http://pcsx2.googlecode.com/svn/branches/async-iso@5479 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-12-13 16:11:53 +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
gregory.hainaut 75484d3059 cmake: apply some updated pathes of Micove 
* drop hack for of Natty and use the std FindGtk2 module, time to upgrade to Precise.
* Bump cmake requirement to 2.8.5 to avoid multiarch issue
* Create new cmake variable GLSL_SHADER_DIR for glsl file.  Default value /usr/share/games/pcsx2


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5200 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-05-07 16:29:06 +00:00
gregory.hainaut bce948d820 cmake: add a bunch of Micove patch. Thanks. 
* Add 2 new dev options: REBUILD_SHADER (nvidia cg) & BUILD_REPLAY_LOADERS
* zzogl-pg-cg will use the shader of zzogl-pg.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5190 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-05-01 10:54:52 +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
gregory.hainaut e3c741bb2a zzogl: painfully merge the zzogl-dev branch 
* new memory management
* asm was replaced by intrinsic
* new GLSL backend (AMD only) Cmake is probably broken anyway with the 2 plugins...
* and lots of others stuff that I forgot about it ;)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5166 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-04-19 21:22:08 +00:00
gregory.hainaut 72d47d547e copyright: 
* update missing copyright on
 + plugins/GSdx/config.h
 + pcsx2/MTVU.h
 + plugins/zzogl-pg/opengl/ZZHacks.h
 + plugins/spu2-x/src/DplIIdecoder.cpp
* put a copyright for trivial script file
 + pcsx2/gui/Resources/rebuild.sh
 + tools/bin2app.sh
 + plugins/zzogl-pg/opengl/shaders.sh
* remove autotool from zzogl
* apply the patch for issue 1257. Thanks very much Micove for the hard work.




git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5154 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-04-12 06:30:35 +00:00
gregory.hainaut b6954701e8 cmake linux: don't build zerospu2. Too much issue on linux, uses spu2x instead. 
debian: fix nvidia cg dependency for latest Ubuntu


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5138 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-03-30 19:04:26 +00:00
gregory.hainaut 0e80e0adca gsdx-ogl: 
* add some define to enable/disable SDL so we could build gsdx without SDL
* debug: dump data based on frame count rather from draw count


git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl@5044 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-01-04 23:19:17 +00:00
gregory.hainaut c9b1e3c1aa cmake: 
* new dev option CMAKE_BUILD_PO: control regeneration of po file. By default true in release build
* Add a hack for multiarch version of wxwidget 


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4951 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-10-31 10:25:24 +00:00
gregory.hainaut@gmail.com 8702685f73 onepad: remember the pad selected (more user expected behavior) 
cmake: CDVDiso need gtk2, remove fatal error for 64bits fedora users


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4649 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-05-14 11:03:02 +00:00
gregory.hainaut@gmail.com a61c657717 onepad, zeropad: init the sdl video subsystem (sdl 1.3). 
cmake: allow to compile pad with sdl 1.3


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4394 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-03-06 14:26:17 +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 3020a37f2c cmake: disable gsdx compilation. I need to port sdl first. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4360 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-02-25 18:19:51 +00:00
gregory.hainaut@gmail.com 870da347be cmake: add GSdx compilation (based on codeblock) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4327 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-02-20 17:01:03 +00:00
arcum42 5c205e00fd Get rid of the *other* copy of liba52, and make sure cmake doesn't look for it. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3889 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-07 09:55:36 +00:00
gregory.hainaut@gmail.com fcba95f4d4 CDVDlinuz: 
* move content of version.h into CDVDlinuz.h (avoid a conflict with version.h located in /usr/include/alsa)
* allow cmake to build it.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3654 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-17 14:39:58 +00:00
gregory.hainaut 7bfae6a2fa [cmake] 
* Add a new header
* Check that libjpeg is installed for zzogl


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3279 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-23 10:07:18 +00:00
gregory.hainaut 3628784ab6 [cmake] 
* add some check on libsparsehash
* print more informative message when a depency miss


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3256 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-21 11:05:30 +00:00
gregory.hainaut 03f96b29c5 [cmake] 
* Select automatically module (include pcsx2, libutilities&libx86emitter) to build based on dependency available.
* rewrite SearchForStuff. More clean and it will better support mix between library and 3rdparty on linux. (see issue 736)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3153 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-04 17:17:55 +00:00
gregory.hainaut 6a9950e9ef * Oups, copy from a wrong file. Restore the value 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3149 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-03 18:04:30 +00:00
gregory.hainaut 5932b130bd * separate build parameter and selection of plugins into new modules. Add comment and status messages 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3148 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-03 17:28:20 +00:00