Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
7604 commits 14 branches 1 tag 255 MiB
Commit graph

403 commits

Author SHA1 Message Date
kervala
9a7d4d3684 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-03 19:36:10 +01:00
kervala
873f4995ce Fixed: Missing PATHS in MySQL CMake module 
--HG--
branch : develop
 2016-01-03 19:35:44 +01:00
kervala
c9262b01c2 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-03 19:18:32 +01:00
kervala
bf19a4c61c Fixed: MySQL client under OS X 
--HG--
branch : develop
 2016-01-03 19:17:44 +01:00
kervala
d999e4a3bd Merge with develop 
--HG--
branch : compatibility-develop
 2015-12-25 18:02:13 +01:00
kervala
1f2678eb10 Fixed: Warnings compiling with Qt 5 
--HG--
branch : develop
 2015-12-25 18:00:37 +01:00
kervala
86a903c96e Merge with develop 
--HG--
branch : compatibility-develop
 2015-12-25 15:37:07 +01:00
kervala
75d16f7054 Fixed: Define QT_NO_DEBUG in Release with Qt 5 also in PCH 
--HG--
branch : develop
 2015-12-25 15:31:34 +01:00
kervala
8965a4d7a5 Merge with develop 
--HG--
branch : compatibility-develop
 2015-12-21 18:20:39 +01:00
kervala
016390446d Changed: Forgot to change RYZOM_GAMES_PREFIX 
--HG--
branch : develop
 2015-12-21 18:20:04 +01:00
kervala
806a6d21ab Changed: Only copy installscript_osx.vdf for Steam client 
--HG--
branch : compatibility-develop
 2015-12-21 17:46:38 +01:00
kervala
fb98ffe809 Changed: Added WITH_RYZOM_CUSTOM_PATCH_SERVER that allows to give priority to PatchUrl defined in client.cfg 
--HG--
branch : develop
 2015-12-21 17:33:32 +01:00
kervala
1b2e607d5d Changed: Add WITH_UNIX_STRUCTURE to use UNIX structure (bin, etc, share, etc...) 
--HG--
branch : develop
 2015-12-21 17:05:18 +01:00
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
kervala
a52df4c710 Changed: Factorized AMD/amd 2013-09-06 08:58:02 +02:00
kervala
26679e767e Changed: Allow to put a "revision" file in root directory if .hg directory is not present 2013-09-06 08:44:57 +02:00
kervala
3e4a567d6a Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases) 2013-09-06 08:43:44 +02:00
StudioEtrange
f10b6613cf ** PCH Support for NMake with VS2012 
NMAKE-VS2012 Error LNK2011
while NMAKE-VS2010 does not complain
we need to link the pch.obj file
see http://msdn.microsoft.com/en-us/library/3ay26wa2(v=vs.110).aspx

** PCH Support for Ninja
Ninja need to add property
        OBJECT_DEPENDS for using PCH
        OBJECT_OUTPUTS for create PCH
see http://public.kitware.com/pipermail/cmake-developers/2012-March/003653.html
 2013-09-05 17:18:01 +02:00
Thibaut Girka
ea8a845ab9 Add support for LibVR 
--HG--
branch : multipass-stereo
 2013-08-28 08:08:22 +02:00
kaetemi
7782576dfc Merge with default 
--HG--
branch : multipass-stereo
 2013-09-07 16:25:45 +02:00
kervala
f680e3943d Changed: Minor formatting 2013-08-05 10:34:38 +02:00
kervala
a41ba055a5 Fixed: PCH with Qt 5 and CMake 2.8.11 2013-08-05 10:32:17 +02:00
kervala
c792c423db Fixed: X64 not detected with CMake 2.8.11 2013-08-05 10:31:23 +02:00
kaetemi
96b2df8405 Merge with default 
--HG--
branch : multipass-stereo
 2013-08-01 23:02:49 +02:00
kaetemi
1e9771d054 Merge with default 
--HG--
branch : multipass-stereo
 2013-07-25 00:37:00 +02:00
StudioEtrange
0efa7c8aee PCHSupport.cmake edited online with Bitbucket 
--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
 2013-07-24 21:57:52 +00:00
StudioEtrange
744267c63b Fix some probleme with spaces in path on windows 
PCHSupport.cmake edited online with Bitbucket

--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
 2013-07-24 20:53:33 +00:00
StudioEtrange
f18dd1f351 Error passing wrong version number to msvc linker 
ENV: WinSDK8 VS2012 Compilation in 64 Bits
ERROR: error when linking client

CAUSE: msvc link support only major and minor version number. Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537 see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx

--HG--
branch : StudioEtrange/error-passing-wrong-version-number-to-ms-1374694351376
 2013-07-24 19:32:41 +00:00
StudioEtrange
885a39ad7e nel.cmake edited online with Bitbucket 
--HG--
branch : StudioEtrange/nelcmake-edited-online-with-bitbucket-1374694264640
 2013-07-24 19:31:10 +00:00
StudioEtrange
cc30e3b8f8 ENV: 
WinSDK8
VS2012
Compilation in 64 Bits

ERROR:
error when linking client

CAUSE:
msvc link support only major and minor version number.
Before VS2012 extra number (like revision number) were stripped. Now the link throw an error with VS2012

see https://bugs.php.net/bug.php?id=63537
see http://msdn.microsoft.com/fr-fr/library/h88b7dc8(v=vs.110).aspx

--HG--
branch : StudioEtrange/env-winsdk8-vs2012-compilation-in-64-bit-1374693753244
 2013-07-24 19:22:38 +00:00
Michael Witrant
a33a0e5c56 LibOVR is optional, and is disabled by default 
--HG--
branch : multipass-stereo
 2013-07-06 20:05:19 +02:00
Michael Witrant
0036b5c619 Added Win32 and Apple LibOVR build paths 
--HG--
branch : multipass-stereo
 2013-07-06 19:55:08 +02:00
Michael Witrant
c60bd3e3f5 Added LibOVR finder and Linux support, ref #43 
--HG--
branch : multipass-stereo
 2013-07-06 19:33:07 +02:00
kaetemi
fba17e4553 Allow linking debug and release with same mysql lib if no specific debug lib. 
--HG--
branch : multipass-stereo
 2013-07-01 18:45:43 +02:00
kaetemi
8629f069ae Allow compiling with shared libxml2 on Windows 2013-06-16 03:19:02 +02:00
kervala
a5806126b4 Fixed: Compilation under Mac OS X (CMAKE_OSX_DEPLOYMENT_TARGET and CMAKE_OSX_SYSROOT must be set on CMake command-line if needed) 2013-03-24 19:59:19 +01:00
mattraykowski
e7e51f01e0 merging gui editor repo. 2013-02-14 09:53:06 -06:00
mattraykowski
3f97c5afbd Added another path for x86_64 Ubuntu 12.10 for libwww 2013-02-14 07:46:42 -06:00
dfighter1985
fcb736c387 Merged mainline default branch changes. 
--HG--
branch : gsoc2012-gui-editor
 2013-02-14 10:47:10 +01:00
kervala
b330b46ee3 Fixed: PCH finally working under Linux and Mac OS X (never worked before) 2012-12-08 11:34:39 +01:00
kervala
ab838c00bf Fixed: revision target not being generated 2012-12-07 14:51:48 +01:00
kervala
f4b72eab54 Changed: Support for VC++ 2012 
Changed: Improvements for iOS
Changed: Support for Android
 2012-12-06 10:44:55 +01:00
kervala
b4d9e2bfdd Fixed: Detect and use Windows 8 SDK only under Visual C++ 2012 2012-12-06 10:23:04 +01:00
dfighter1985
cb13ce46cd MODIFIED: #1471 Merged mainline default to this branch. 
--HG--
branch : gsoc2012-gui-editor
 2012-11-25 05:22:40 +01:00
kervala
ff18f8f0ec Fixed: Problem while parsing hg command line with a german locale 2012-11-04 17:10:26 +01:00
kervala
2e6361ebfe Fixed: revision.h error when hg executable not found 2012-10-22 14:56:25 +02:00
kervala
b421b38def Changed: Use of CMAKE_OSX_ARCHITECTURES to compile universal binaries under Mac OS X 2012-10-08 19:06:08 +02:00
kervala
3c19f1a2f4 Changed: Don't use CMAKE_LIBRARY_ARCHITECTURE at all, because not reliable enough 2012-10-07 13:58:59 +02:00
kervala
af4ed15c36 Changed: CXXFLAGS and CPPFLAGS support in CMake 
Changed: Use LIBRARY_ARCHITECTURE to override CMAKE_LIBRARY_ARCHITECTURE
 2012-10-03 22:31:12 +02:00
kervala
122fef354c Changed: Don't check Debian environment variables in CMake scripts (define options on cmake command-line instead) 2012-10-03 10:08:56 +02:00
kervala
4a1df6eb66 Changed: #1444 Allow to provide custom revision.h 2012-10-02 13:12:13 +02:00