Commit graph

340 commits

Author SHA1 Message Date
kervala
7ca5e7acf6 Fixed: Compilation with Qt 5 static under Linux
--HG--
branch : develop
2015-12-21 14:20:36 +01:00
kervala
a3b6e87b0d Changed: Disable useless message
--HG--
branch : develop
2015-12-16 08:00:06 +01:00
kervala
e486cac363 Fixed: Wrong cases
--HG--
branch : develop
2015-12-15 18:46:15 +01:00
kervala
651870a2c9 Fixed: Allow to find Windows SDK libraries in lib/amd64 too
--HG--
branch : develop
2015-12-15 18:28:50 +01:00
kervala
1ab5357804 Changed: Updates CMake modules
--HG--
branch : develop
2015-12-15 13:41:27 +01:00
kervala
c1716ae3db Fixed: Include directories with Qt 5 CMake modules in PCH
--HG--
branch : develop
2015-12-15 13:41:07 +01:00
kervala
8761ee3bcd Fixed: RETURN() doesn't exit from macro but from current file (thanks Nimetu!)
--HG--
branch : develop
2015-12-07 13:08:27 +01:00
kervala
a245857986 Changed: Remove specific C++ dialects for warnings
--HG--
branch : develop
2015-12-05 18:51:15 +01:00
kervala
1fa2e22491 Changed: Port some tools to Qt 5
--HG--
branch : develop
2015-12-05 18:48:59 +01:00
kervala
1afec95dd9 Fixed: Only display VR page in game config if compiled with a VR SDK
--HG--
branch : develop
2015-12-01 15:58:45 +01:00
kervala
68cbba44ce Fixed: Assimp depends on ZLIB
--HG--
branch : develop
2015-11-30 14:19:38 +01:00
kervala
804a635993 Changed: Display revision
--HG--
branch : develop
2015-11-29 14:35:55 +01:00
kervala
7a2dd18095 Changed: Add and use more constants in config.h
--HG--
branch : develop
2015-11-29 14:19:02 +01:00
kervala
abb6b28661 Fixed: ROOT_DIR is the parent of CMAKE_SOURCE_DIR
--HG--
branch : develop
2015-11-29 14:11:17 +01:00
kervala
27b45b40e8 Fixed: Use STRING(TIMESTAMP ...) since CMake 2.8.11 to get build time
--HG--
branch : develop
2015-11-29 14:10:42 +01:00
kervala
2fa0544912 Changed: Don't generate revision.h anymore
--HG--
branch : develop
2015-11-29 14:09:21 +01:00
kervala
520eb941b1 Changed: Simplified CMake ELSE and ENDIF
--HG--
branch : develop
2015-11-29 14:06:05 +01:00
kervala
39bda44106 Changed: Removed useless checks in config.h
--HG--
branch : develop
2015-11-29 14:02:44 +01:00
kaetemi
6c2490090d Merge with feature-export-assimp
--HG--
branch : develop
2015-11-16 00:46:27 +01:00
kervala
f1a75132dd Changed: CMake end tags
--HG--
branch : develop
2015-11-03 14:04:06 +01:00
kervala
44bfc85c7a Fixed: Wrong external detection (we don't use libwww anymore, so new external don't have it)
--HG--
branch : develop
2015-11-03 14:03:46 +01:00
kervala
69100c20f0 Fixed: Wrong end tags
--HG--
branch : develop
2015-11-01 17:04:59 +01:00
kervala
ec39ef13bf Changed: Support for Lua 5.3 (can be improved)
--HG--
branch : develop
2015-11-01 17:04:41 +01:00
kervala
5fc3c52df9 Fixed: Don't add dependency on target revision if not defined
--HG--
branch : develop
2015-10-25 15:16:29 +01:00
kervala
52800cd03b Fixed: GCC 5 version check fails for PCH support
--HG--
branch : develop
2015-10-25 15:11:27 +01:00
kervala
2910b1a375 Fixed: Warnings with CMake
--HG--
branch : develop
2015-10-06 20:31:41 +02:00
kervala
eb5f46fbae Changed: Use less verbose version for ELSE(), ENDIF(), ENDFOREACH() and ENDMACRO()
--HG--
branch : develop
2015-10-06 20:30:43 +02:00
kaetemi
8179ee3836 Add assimp dependency
--HG--
branch : feature-export-assimp
2015-09-19 16:46:59 +02:00
kaetemi
96116c6eba Todo note
--HG--
branch : develop
2015-07-10 06:33:14 +02:00
kaetemi
9a10f1413b Fix DXSDK include order
--HG--
branch : develop
2015-07-10 06:16:19 +02:00
kaetemi
cac661dbca SDK 8.1 support
--HG--
branch : develop
2015-07-10 05:50:05 +02:00
Nimetu
be95880a95 Remove libwww, only keep html entitites list
--HG--
branch : develop
2015-04-17 15:10:00 +03:00
kaetemi
72475cf719 Fix FindLibOVR cmake script
--HG--
branch : develop
2015-02-24 17:17:45 +01:00
kaetemi
a8db3b2dda Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
2015-02-20 18:10:06 +01:00
kaetemi
6db8abf95c Visual Studio 2013 compilation support for NLMISC
--HG--
branch : develop
2015-02-20 16:24:19 +01:00
kervala
e8b0765e7c Merge with hotfix
--HG--
branch : develop
2015-02-14 14:31:19 +01:00
kervala
e0c95a74af Changed: Updated CMale modules
--HG--
branch : hotfix
2015-02-14 13:47:37 +01:00
kervala
eb5fecf8ce Fixed: Only keep Release and Debug configurations in CMake
--HG--
branch : hotfix
2015-02-14 12:06:19 +01:00
dfighter1985
972d270bfc Merged in hotfix (pull request #105)
Merge hotfix

--HG--
branch : develop
2015-02-02 23:32:08 +01:00
dfighter1985
bdb633cf83 Use release squish if debug not found. Fixes s3tc compressor tool build.
--HG--
branch : hotfix
2015-02-02 23:25:11 +01:00
kervala
ec12e6a75e Changed: Allow to enable UAC for Windows client
--HG--
branch : develop
2014-12-26 13:44:03 +01:00
kervala
f745f82455 Changed: Give priority to Luabind library filenames with specific Lua version
--HG--
branch : develop
2014-12-26 13:43:20 +01:00
kervala
e34ba83f26 Minor changes
--HG--
branch : develop
2014-10-10 13:08:14 +02:00
nimetu
dcf2906b94 find lua version for luabind under fedora
--HG--
branch : nimetu/find-lua-version-for-luabind-under-fedor-1412076128442
2014-09-30 11:23:16 +00:00
dfighter1985
8373118c7e Merged default.
--HG--
branch : gsoc2014-dfighter
2014-07-22 00:15:50 +02:00
kervala
38f79138b9 Changed: Determinates 3dsmax SDK base directory 2014-07-19 14:04:19 +02:00
kervala
1ace2090fb Fixed: Give priority to fmod64 in 64 bits 2014-07-19 14:03:22 +02:00
kaetemi
5312547295 Add option for -mfpmath=both flag 2014-06-20 19:46:33 +02:00
kaetemi
ed5721a79b Add SSE3 compile flag if enabled 2014-06-20 18:51:34 +02:00
kaetemi
ac3e69b8ab Merge with default
--HG--
branch : sse2
2014-06-20 03:01:32 +02:00
kaetemi
9838ef56de Fix Snowballs compile under MinGW 2014-06-18 02:05:54 +02:00
kaetemi
3dd11fe157 Fix compilation of NLMISC under MinGW 2014-06-17 21:48:25 +02:00
kaetemi
4ed37ac68e SSE2: Add CMake options
--HG--
branch : sse2
2014-06-13 19:00:24 +02:00
dfighter1985
12890373a4 Merged default
--HG--
branch : gsoc2014-dfighter
2014-05-14 18:01:15 +02:00
dfighter1985
91f859bc8a Moved ovqt to /code/studio
--HG--
branch : gsoc2014-dfighter
2014-05-06 01:30:28 +02:00
kervala
24fa8df5ff Fusion avec default
--HG--
branch : compatibility
2014-04-24 19:16:42 +02:00
kervala
5a88951837 Changed: Find DirectX libraries in alternative folders
--HG--
branch : compatibility
2014-04-11 17:56:26 +02:00
kervala
a8c35f9229 Fixed: Used code being removed by -Wl,-x on Mac OS X 2014-03-27 13:03:38 +01:00
kervala
f62b19eb71 Fixed: Used code being removed by -Wl,-x on Mac OS X
--HG--
branch : compatibility
2014-03-27 13:03:38 +01:00
kervala
6c4d33c2a6 Changed: Improvements in patch system 2014-03-22 16:23:17 +01:00
StudioEtrange
994c47dc92 fix find windows.h for winsdk8
--HG--
branch : cmake-fixes
2014-02-21 17:35:15 +01:00
StudioEtrange
646b8fc9ae Fix bug cannot find right include folder for winsdk8
--HG--
branch : cmake-fixes
2014-02-21 16:40:04 +01:00
kervala
20ce763f35 Changed: Improvements in patch system
--HG--
branch : compatibility
2014-03-22 16:23:17 +01:00
botanic
666ab7ebec Added linux patcher! 2014-02-07 20:10:07 -08:00
botanic
e728daa7cd Add CMAKE option and NVIDIA PerfHUD support 2014-02-07 19:49:40 -08:00
kervala
3980513e12 Fixed: Compilation with freetype under Linux 2014-02-01 13:59:47 +01:00
kervala
1c50b1f943 Fixed: Compilation under Mac OS X 10.9 2014-01-30 14:43:51 +01:00
kervala
a5a9532a13 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
ee8edac294 Fixed: #96 cmake and freetype detection on Linux Debian SID 2014-01-22 10:24:35 +01:00
kervala
19f7bc931e Fixed: Warning "LNK4224: /INCREMENTAL:YES is no longer supported" 2013-11-22 11:27:30 +01:00
kervala
98c862136a Changed: Manual -isysroot and -mmacosx-version-min useless because already set by CMake 2013-11-13 22:52:48 +01:00
kervala
588d262dbf Fixed: MFC can't be found 2013-10-30 20:46:19 +01:00
kervala
28b9fbe8bc Changed: Search for default installation paths under Windows 2013-10-21 17:50:21 +02:00
kervala
bc8490adb7 Changed: Detect Express versions 2013-09-27 11:05:52 +02:00
kervala
2aba0ec52f 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
4fee35c5b3 Fixed: Windows SDK detection for some previous versions 2013-09-27 09:26:22 +02:00
kervala
65d9c70cd9 Fixed: LNK2011 when using external libraries 2013-09-26 22:50:13 +02:00
kervala
03201f979f Changed: Improved Windows SDK detection 2013-09-26 22:49:30 +02:00
kervala
c7deb1b0c4 Changed: FIX_PRECOMPILED_HEADER now useless 2013-09-22 11:05:13 +02:00
kervala
3294955c60 Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API 2013-09-22 10:47:12 +02:00
StudioEtrange
d81c9db04e FindMSVC fix 2013-09-21 14:14:29 +02:00
kaetemi
973215e1d0 Cleanup
--HG--
branch : multipass-stereo
2013-09-14 00:36:06 +02:00
kaetemi
d2bc32e598 Merge with default
--HG--
branch : multipass-stereo
2013-09-13 23:07:49 +02:00
kervala
11dd2bc101 Changed: Look for Debug versions of libwww libraries 2013-09-08 12:53:35 +02:00
kervala
17ebe78cf6 Changed: Look for Debug version of freetype and use it for Debug configuration 2013-09-08 10:26:23 +02:00
kaetemi
0a3f3f1760 Merge with default
--HG--
branch : multipass-stereo
2013-09-07 21:36:08 +02:00
StudioEtrange
3121a83730 Merged ryzom/ryzomcore into default 2013-09-07 20:16:17 +02:00
kervala
9dccf31863 Removed: S3TC module because not used anymore 2013-09-07 17:01:06 +02:00
StudioEtrange
fec561914d Merged ryzom/ryzomcore into default 2013-09-07 01:39:45 +02:00
kervala
37fa1fa1ec Fixed: Use 32 bits libraries from Windows SDK in 64 bits 2013-09-06 14:48:21 +02:00
kervala
d196f05b7e Removed: DInput module because it's not used anymore 2013-09-06 14:44:03 +02:00
StudioEtrange
d2530f6894 Merged ryzom/ryzomcore into default 2013-09-06 14:14:51 +02:00
kervala
f2bc8f3c8c Added: Toolchains for Android and iOS 2013-09-06 13:38:19 +02:00
kervala
3988120c55 Changed: Allows to choose a specific Windows SDK version with WINSDK_VERSION
Changed: Look for all installed Windows SDKs
2013-09-06 13:35:43 +02:00
kervala
6ddf4786ff Changed: Use /X everytime with MSVC 2013-09-06 09:30:54 +02:00
kervala
3a7cee4aa7 Changed: Improved MFC module 2013-09-06 09:26:23 +02:00
kervala
4a4b9b5ab8 Changed: Detect hg binary under Mac OS X if /opt/local/bin is not in PATH 2013-09-06 09:02:48 +02:00
kervala
651065e4ed Added: MSVC module to use later 2013-09-06 09:01:42 +02:00
kervala
a71f08274e Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS 2013-09-06 09:00:33 +02:00
kervala
969d9a057d Changed: Display a message when compiling with NMake and define NMAKE 2013-09-06 08:58:36 +02:00