Commit Graph

53 Commits

Author SHA1 Message Date
Johannes Obermayr
7b1d3ba7ea Do commits 2bc2047 and f287754 the right way ... 2014-09-16 19:11:11 +02:00
Gregory Hainaut
e8b3532658 cmake: clean main file and option
Move build configuration from CMakeLists to cmake/BuildParameters.cmake where it belongs
Use option syntax for on/off option
Complete a bit previous commit to force all 64bits path detections (likely done by cmake)
2014-07-05 14:54:56 +02:00
Ryan Houdek
35979bb5a6 Add a CMake compile time option for building a 64bit binary.
By default the cmake build will still cross compile a 32bit binary and spout a message about it if not enabled.
This doesn't fix the 64bit build issues, just makes it easier for someone to test 64bit builds in the future.
Look towards a bright future instead of a dark and gloomy past
2014-07-05 05:09:17 -05:00
Gregory Hainaut
a86f2615be 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:42:56 +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
22e02b545e cmake: fatal error when path contains some parenthesis 2014-03-30 16:36:02 +02:00
gregory.hainaut
61da62bf27 pcsx2: Create GetProgramDataDir (for cheats_ws and game db)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5851 96395faa-99c1-11dd-bbfe-3dabce05a288
2014-01-27 18:59:52 +00:00
gregory.hainaut
48356e31b8 linux:
* use same path as game index db for cheats and cheats_ws
* install the new cheat zip file on cmake and debian installer 


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5850 96395faa-99c1-11dd-bbfe-3dabce05a288
2014-01-26 18:00:14 +00:00
gregory.hainaut
6214fd0456 pcsx2: Used correct path for cheats/cheats_ws (thanks avih)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5824 96395faa-99c1-11dd-bbfe-3dabce05a288
2014-01-24 17:41:23 +00:00
gregory.hainaut
5df7af9bc5 cmake:
* new option SDL2_API
* drop GLSL_SHADER_DIR. Useless, shaders are embedded in .h file
* use some hardening flags (for the moment only basic one)
onepad:
* port the code to SDL2 (Note only SDL1 is supported for the moment)
* improve detection of button vs axis (long-standing issue)
* avoid potential overflow on mouse mouvement detection


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5756 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-11-01 21:05:59 +00:00
gregory.hainaut
544c84a344 gsdx:
* try to setup advance gl context attribute. If driver doesn't support it fallback to the default.

zzogl:
* use glsl2h to generate an header shader as GSdx. Much easier to install
* Get GSUniformBufferOGL & GSVertexArrayOGL speed improvement from GSdx

cmake:
* detect current gcc version. Yield  a warning if < 4.7 or an error if < 4.5

glsl2h:
* support zzogl too
* compute md5sum to avoid useless relink


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5696 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-07-06 09:42:46 +00:00
gregory.hainaut
3c7167be50 clean (some) gdb warning: round 1
* use svnrev.h on linux too
* replace sprintf_s with snprintf (hope it still compile on Windows)
* init integer with 0 instead of NULL
* various int -> u32/uint32/uint on for loop index
* remove a couple of unused variable
* init few variable
* disable unused warning results


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5683 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-06-28 10:43:50 +00:00
gregory.hainaut
3c3e0f7113 cmake: always use /usr/lib/i386-linux-gnu when it exists
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5463 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-11-24 22:37:26 +00:00
gregory.hainaut
972aa02c11 cmake: policy existence must be checked on older Cmake version...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5439 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-10-25 18:10:28 +00:00
gregory.hainaut
d5b318b990 zzogl:
* move all remaining glx into the dedicated GLwin object
* rework a bit WGL to separate opengl context and window creation (like linux actually)

gsdx: Allow to control vsync. Not sure I used the good extension.

cmake: 
* check that EGL opengl context creation
* Shut up gcc warning when force inline might not work...



git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5437 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-10-21 18:10:13 +00:00
gregory.hainaut
68fa8ae195 cmake:
* search 32-bits library on /usr/lib/../lib32 on 64 system (if they don't support Debian/Ubuntu multiarch)
* downgrade the 64-bits FATAL_ERROR to a warning. It is much more easier to use multiarch than to set a chroot.
* incorporate Micove's patch to allow keyword on PLUGIN_DIR define. (fixed issue 1233)
* Allow to use command line pcsx2 option with the linux launcher script. Thanks Rafael for the idea.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5378 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-08-15 10:31:28 +00:00
gregory.hainaut
68a833f4e7 cmake:
* set CMAKE_POSITION_INDEPENDENT_CODE variable for future cmake policy (which need to be upgraded to remove some warnings)
* On multiarch system, force the search on 32bits library (/usr/lib/i386-linux-gnu). Change previous compilation behavior on 64 bits system
    - Before: cmake search lib in 64 bits dir (64 bits lib needed to be install) but the linker got the 32 bits lib under the hood.
    + now: cmake search lib in 32 bits dir (only 32 bits lib need to be install). The linker still get 32 bits lib. In others word, you need to install -dev:i386 package on debian/ubuntu system



git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5367 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-08-12 07:26:39 +00:00
ramapcsx2
36669d17cd Cleanup part 3: Update the cmake files in /trunk and /1.0 and upload the readme and faq pdf to /trunk
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5361 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-08-06 12:00:29 +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
8eae370e86 cmake: doc renaming broke the package mode
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5175 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-04-24 06:49:14 +00:00
gregory.hainaut
5627b4dfaf copyright:
* change the man page to gpl3
* add missing copyrigh for zerogsshader
* re write bin2cpp tool (in perl) to avoid any copyright issue => hex2h.pl


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5155 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-04-12 17:52:43 +00:00
gregory.hainaut
4593b6ac52 gsdx: linux compilation fix. Gcc don't support same name for variable and template parameter
cmake: compilation fix on debian sid (and potentially ubuntu)
i18n: add some comment for potential language change in the future.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5088 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-02-06 18:16:49 +00:00
arcum42
d398e19b4d GSnull: Rework the logging code a bit. (The logging actually prints to the screen now, for one thing.)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4950 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-10-30 01:39:43 +00:00
gregory.hainaut
274246c557 i18n: long-awaited update. Big changes on pt_BR/sv_SE/zh_*
cmake: install also the man page


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4920 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-09-28 18:36:31 +00:00
gregory.hainaut
b5959076e5 linux: clean various linux file into 1 directory
cmake: automatically install desktop/doc/xpm file in package mode as requested by Rafael
debian: align on latest change


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4909 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-09-04 20:39:19 +00:00
gregory.hainaut@gmail.com
5adba505e7 pcsx2, zzogl-pg: allow to change some default path with compilation flags.
cmake: Add PLUGIN_DIR and GAMEINDEX_DIR options to easily select install directory. Install GameIndex.dbt during install phase.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4811 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-07-17 11:25:17 +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
052cd4d45e cmake: add some properties to compile on fedora 64 bits
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4320 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-19 19:02:24 +00:00
gregory.hainaut@gmail.com
db948003df cmake: add a PACKAGE_MODE option to reduce the burden of packaging
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4289 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-02-12 10:37:44 +00:00
gregory.hainaut@gmail.com
2382c35b83 cmake: (WIP) rule to compile translation file on linux.
Note: to install them, you must call "make install" with root access. Files will be install into /usr/local/share/locales...


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4238 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-01-20 20:45:07 +00:00
gregory.hainaut@gmail.com
b39546fe81 cmake: rework the resource stuff. Avoid rebuild and files are clear by cmake.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4095 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-12-14 21:44:12 +00:00
gregory.hainaut@gmail.com
0f772de2ec cmake: Add ressource file
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4093 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-12-14 19:08:15 +00:00
gregory.hainaut
c4eeb9de9a cmake: Upgrade cmake requierement to 2.8. (there is some incompatible change in foreach arguments...)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3577 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-28 14:51:02 +00:00
gregory.hainaut
7e6dba3b7a [cmake] Add a fatal error for pure amd64 distributions.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3499 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-15 22:24:35 +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
f57ac9d1d9 [cmake]
* move build options to the build module
* Add some documentation about the default cmake build options


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3389 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-04 12:37:42 +00:00
gregory.hainaut
3d9c63b0f0 [cmake]:
* Print a fatal_error when users do not source the good CMakeLists file.
* Do not search system libraries if the user force the internal libraries


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3269 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-06-22 13:30:36 +00:00
gregory.hainaut
f775d20cbc [cmake]
* Better separation between pcsx2/plugins/3rdparty => no need anymore to download everythings :)
* Drop build dependency on unused libBPM (from soundtouch)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3180 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-06-07 13:32:10 +00:00
gregory.hainaut
7883180ab9 [cmake]
* align cmake flags with codeblock one. (note spu2x may still fail to compile with inline problem)
* Some final cleaning. You must be able to see your reflection now ;)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3169 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-06-05 11:56:52 +00:00
gregory.hainaut
86a7a85b99 [cmake]
* Add missing file
* Use a default option for FORCE_INTERNAL_SOUNDTOUCH instead of a hardcoded one
* Some cleaning


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3156 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-06-04 20:35:02 +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
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
arcum42
58786f8218 cmake: commit some cleanup work (done by gregory).
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3061 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-23 07:51:43 +00:00
arcum42
a0d7e4a1b8 cmake: Fix the default build type. Add some CMakeList files.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3060 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-23 07:30:36 +00:00
arcum42
460728393a cmake: Update some missing files. Compile Devel by default.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3056 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-22 05:07:07 +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
arcum42
de91c8f30b cmake: Some patches from athos and gregory. spu2-x builds in cmake.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3020 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-15 23:36:13 +00:00
arcum42
deb0f620d7 cmake: Make Devel the default for the moment. Commit another cmake patch...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2956 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-06 09:33:23 +00:00
arcum42
152a36fa98 Replaced some defines that were accidentally removed at some point. Did some cmake work. Removed a forceinline that was giving gcc issues.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2951 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-05-05 20:06:05 +00:00