Commit graph

351 commits

Author SHA1 Message Date
kervala
53a5f1275f Merge with develop 2016-01-03 19:18:32 +01:00
kervala
c0b80fd891 Fixed: MySQL client under OS X 2016-01-03 19:17:44 +01:00
kervala
6724e38a65 Merge with develop 2015-12-25 18:02:13 +01:00
kervala
007e47120a Fixed: Warnings compiling with Qt 5 2015-12-25 18:00:37 +01:00
kervala
cb1cd569c2 Merge with develop 2015-12-25 15:37:07 +01:00
kervala
501f31e03b Fixed: Define QT_NO_DEBUG in Release with Qt 5 also in PCH 2015-12-25 15:31:34 +01:00
kervala
19457b07a6 Merge with develop 2015-12-21 18:20:39 +01:00
kervala
7cf63f2b80 Changed: Forgot to change RYZOM_GAMES_PREFIX 2015-12-21 18:20:04 +01:00
kervala
dc4cefff2b Changed: Only copy installscript_osx.vdf for Steam client 2015-12-21 17:46:38 +01:00
kervala
84f8628385 Changed: Added WITH_RYZOM_CUSTOM_PATCH_SERVER that allows to give priority to PatchUrl defined in client.cfg 2015-12-21 17:33:32 +01:00
kervala
6cefa245d9 Changed: Add WITH_UNIX_STRUCTURE to use UNIX structure (bin, etc, share, etc...) 2015-12-21 17:05:18 +01:00
kervala
ec1ee961e8 Fixed: Compilation with Qt 5 static under Linux 2015-12-21 14:20:36 +01:00
kervala
c82e1ff022 Changed: Disable useless message 2015-12-16 08:00:06 +01:00
kervala
6f59be0acb Fixed: Wrong cases 2015-12-15 18:46:15 +01:00
kervala
0943667a57 Fixed: Allow to find Windows SDK libraries in lib/amd64 too 2015-12-15 18:28:50 +01:00
kervala
89d2034edc Changed: Updates CMake modules 2015-12-15 13:41:27 +01:00
kervala
2187bc3f1e Fixed: Include directories with Qt 5 CMake modules in PCH 2015-12-15 13:41:07 +01:00
kervala
c31509f274 Fixed: RETURN() doesn't exit from macro but from current file (thanks Nimetu!) 2015-12-07 13:08:27 +01:00
kervala
b018690171 Changed: Remove specific C++ dialects for warnings 2015-12-05 18:51:15 +01:00
kervala
797c48a592 Changed: Port some tools to Qt 5 2015-12-05 18:48:59 +01:00
kervala
eaab558f2a Fixed: Only display VR page in game config if compiled with a VR SDK 2015-12-01 15:58:45 +01:00
kervala
f611efc153 Fixed: Assimp depends on ZLIB 2015-11-30 14:19:38 +01:00
kervala
bdcdc7c693 Changed: Display revision 2015-11-29 14:35:55 +01:00
kervala
a6ed27598f Changed: Add and use more constants in config.h 2015-11-29 14:19:02 +01:00
kervala
4ca1b40b6b Fixed: ROOT_DIR is the parent of CMAKE_SOURCE_DIR 2015-11-29 14:11:17 +01:00
kervala
fcc164fd59 Fixed: Use STRING(TIMESTAMP ...) since CMake 2.8.11 to get build time 2015-11-29 14:10:42 +01:00
kervala
313912d7ba Changed: Don't generate revision.h anymore 2015-11-29 14:09:21 +01:00
kervala
532aaa1078 Changed: Simplified CMake ELSE and ENDIF 2015-11-29 14:06:05 +01:00
kervala
b990a23095 Changed: Removed useless checks in config.h 2015-11-29 14:02:44 +01:00
kaetemi
df382464d8 Merge with feature-export-assimp 2015-11-16 00:46:27 +01:00
kervala
285ff45526 Changed: CMake end tags 2015-11-03 14:04:06 +01:00
kervala
f4e7edc836 Fixed: Wrong external detection (we don't use libwww anymore, so new external don't have it) 2015-11-03 14:03:46 +01:00
kervala
2d170378ab Fixed: Wrong end tags 2015-11-01 17:04:59 +01:00
kervala
c77bbfc5e3 Changed: Support for Lua 5.3 (can be improved) 2015-11-01 17:04:41 +01:00
kervala
e436b954d0 Fixed: Don't add dependency on target revision if not defined 2015-10-25 15:16:29 +01:00
kervala
55150a8242 Fixed: GCC 5 version check fails for PCH support 2015-10-25 15:11:27 +01:00
kervala
fbbbf0c2eb Fixed: Warnings with CMake 2015-10-06 20:31:41 +02:00
kervala
8225deee4e Changed: Use less verbose version for ELSE(), ENDIF(), ENDFOREACH() and ENDMACRO() 2015-10-06 20:30:43 +02:00
kaetemi
681c1e089b Add assimp dependency 2015-09-19 16:46:59 +02:00
kaetemi
80d4e91d74 Todo note 2015-07-10 06:33:14 +02:00
kaetemi
ab0aed948a Fix DXSDK include order 2015-07-10 06:16:19 +02:00
kaetemi
e8e66df3cd SDK 8.1 support 2015-07-10 05:50:05 +02:00
Nimetu
f3c99aa589 Remove libwww, only keep html entitites list 2015-04-17 15:10:00 +03:00
kaetemi
e2c3fc8968 Fix FindLibOVR cmake script 2015-02-24 17:17:45 +01:00
kaetemi
28a4989c17 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 18:10:06 +01:00
kaetemi
881bbc6083 Visual Studio 2013 compilation support for NLMISC 2015-02-20 16:24:19 +01:00
kervala
5221bf199c Merge with hotfix 2015-02-14 14:31:19 +01:00
kervala
779492b262 Changed: Updated CMale modules 2015-02-14 13:47:37 +01:00
kervala
14046699bc Fixed: Only keep Release and Debug configurations in CMake 2015-02-14 12:06:19 +01:00
dfighter1985
5537d4b627 Merged in hotfix (pull request #105)
Merge hotfix
2015-02-02 23:32:08 +01:00
dfighter1985
b5e9dfbc9e Use release squish if debug not found. Fixes s3tc compressor tool build. 2015-02-02 23:25:11 +01:00
kervala
a728ae6b36 Changed: Allow to enable UAC for Windows client 2014-12-26 13:44:03 +01:00
kervala
25d1aa1d1f Changed: Give priority to Luabind library filenames with specific Lua version 2014-12-26 13:43:20 +01:00
kervala
e4ab2467c1 Minor changes 2014-10-10 13:08:14 +02:00
nimetu
adf5cb28b5 find lua version for luabind under fedora 2014-09-30 11:23:16 +00:00
dfighter1985
8971f98722 Merged default. 2014-07-22 00:15:50 +02:00
kervala
0c3c9ca77a Changed: Determinates 3dsmax SDK base directory 2014-07-19 14:04:19 +02:00
kervala
fab8d1d22f Fixed: Give priority to fmod64 in 64 bits 2014-07-19 14:03:22 +02:00
kaetemi
d518f6b730 Add option for -mfpmath=both flag 2014-06-20 19:46:33 +02:00
kaetemi
ca8f75bea8 Add SSE3 compile flag if enabled 2014-06-20 18:51:34 +02:00
kaetemi
b9576c93dd Merge with default 2014-06-20 03:01:32 +02:00
kaetemi
9f699b4923 Fix Snowballs compile under MinGW 2014-06-18 02:05:54 +02:00
kaetemi
5b47ca4709 Fix compilation of NLMISC under MinGW 2014-06-17 21:48:25 +02:00
kaetemi
3601168194 SSE2: Add CMake options 2014-06-13 19:00:24 +02:00
dfighter1985
9ee5a37ffd Merged default 2014-05-14 18:01:15 +02:00
dfighter1985
f32545dda8 Moved ovqt to /code/studio 2014-05-06 01:30:28 +02:00
kervala
22374fb124 Fusion avec default 2014-04-24 19:16:42 +02:00
kervala
3d95fa2d71 Changed: Find DirectX libraries in alternative folders 2014-04-11 17:56:26 +02:00
kervala
c159b13f5b Fixed: Used code being removed by -Wl,-x on Mac OS X 2014-03-27 13:03:38 +01:00
kervala
a38f20fba1 Fixed: Used code being removed by -Wl,-x on Mac OS X 2014-03-27 13:03:38 +01:00
kervala
3ed24c6955 Changed: Improvements in patch system 2014-03-22 16:23:17 +01:00
StudioEtrange
8c5094817b fix find windows.h for winsdk8 2014-02-21 17:35:15 +01:00
StudioEtrange
9c37e0f077 Fix bug cannot find right include folder for winsdk8 2014-02-21 16:40:04 +01:00
kervala
4011c6c70c Changed: Improvements in patch system 2014-03-22 16:23:17 +01:00
botanic
58c6b188d7 Added linux patcher! 2014-02-07 20:10:07 -08:00
botanic
777aa0b6ae Add CMAKE option and NVIDIA PerfHUD support 2014-02-07 19:49:40 -08:00
kervala
cb5a600578 Fixed: Compilation with freetype under Linux 2014-02-01 13:59:47 +01:00
kervala
37d36e0ab5 Fixed: Compilation under Mac OS X 10.9 2014-01-30 14:43:51 +01:00
kervala
f256e78b2c Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h) 2014-01-26 11:03:33 +01:00
kervala
3fc3f584a3 Fixed: #96 cmake and freetype detection on Linux Debian SID 2014-01-22 10:24:35 +01:00
kervala
47bcf3504e Fixed: Warning "LNK4224: /INCREMENTAL:YES is no longer supported" 2013-11-22 11:27:30 +01:00
kervala
4a46f42889 Changed: Manual -isysroot and -mmacosx-version-min useless because already set by CMake 2013-11-13 22:52:48 +01:00
kervala
48c6c213c6 Fixed: MFC can't be found 2013-10-30 20:46:19 +01:00
kervala
1e5fe9a8c1 Changed: Search for default installation paths under Windows 2013-10-21 17:50:21 +02:00
kervala
d2749d1857 Changed: Detect Express versions 2013-09-27 11:05:52 +02:00
kervala
3ab977f4d7 Changed: Don't use anymore the current SDK in registry (very unreliable)
Changed: Use the Windows SDK installed with VC++ or the most recent compatible one
2013-09-27 10:52:44 +02:00
kervala
f6ddcacd56 Fixed: Windows SDK detection for some previous versions 2013-09-27 09:26:22 +02:00
kervala
2709a72e43 Fixed: LNK2011 when using external libraries 2013-09-26 22:50:13 +02:00
kervala
2af24d272b Changed: Improved Windows SDK detection 2013-09-26 22:49:30 +02:00
kervala
725093587d Changed: FIX_PRECOMPILED_HEADER now useless 2013-09-22 11:05:13 +02:00
kervala
482e37bed2 Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API 2013-09-22 10:47:12 +02:00
StudioEtrange
16b23da06b FindMSVC fix 2013-09-21 14:14:29 +02:00
kaetemi
08f37643b7 Cleanup 2013-09-14 00:36:06 +02:00
kaetemi
7d0a84b2d1 Merge with default 2013-09-13 23:07:49 +02:00
kervala
e5423d5a3a Changed: Look for Debug versions of libwww libraries 2013-09-08 12:53:35 +02:00
kervala
d5baba13e8 Changed: Look for Debug version of freetype and use it for Debug configuration 2013-09-08 10:26:23 +02:00
kaetemi
fca15bd084 Merge with default 2013-09-07 21:36:08 +02:00
StudioEtrange
3721135484 Merged ryzom/ryzomcore into default 2013-09-07 20:16:17 +02:00
kervala
6489e9e04f Removed: S3TC module because not used anymore 2013-09-07 17:01:06 +02:00
StudioEtrange
93f9ca83f6 Merged ryzom/ryzomcore into default 2013-09-07 01:39:45 +02:00