Commit graph

116 commits

Author SHA1 Message Date
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
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
2fa0544912 Changed: Don't generate revision.h anymore
--HG--
branch : develop
2015-11-29 14:09:21 +01:00
kaetemi
6c2490090d Merge with feature-export-assimp
--HG--
branch : develop
2015-11-16 00:46:27 +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
kaetemi
8179ee3836 Add assimp dependency
--HG--
branch : feature-export-assimp
2015-09-19 16:46:59 +02:00
kaetemi
9a10f1413b Fix DXSDK include order
--HG--
branch : develop
2015-07-10 06:16:19 +02: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
eb5fecf8ce Fixed: Only keep Release and Debug configurations in CMake
--HG--
branch : hotfix
2015-02-14 12:06:19 +01:00
kervala
ec12e6a75e Changed: Allow to enable UAC for Windows client
--HG--
branch : develop
2014-12-26 13:44:03 +01:00
dfighter1985
8373118c7e Merged default.
--HG--
branch : gsoc2014-dfighter
2014-07-22 00:15:50 +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
91f859bc8a Moved ovqt to /code/studio
--HG--
branch : gsoc2014-dfighter
2014-05-06 01:30:28 +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
6c4d33c2a6 Changed: Improvements in patch system 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
1c50b1f943 Fixed: Compilation under Mac OS X 10.9 2014-01-30 14:43:51 +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
3294955c60 Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API 2013-09-22 10:47:12 +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
6ddf4786ff Changed: Use /X everytime with MSVC 2013-09-06 09:30:54 +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
c792c423db Fixed: X64 not detected with CMake 2.8.11 2013-08-05 10:31:23 +02:00
kaetemi
1e9771d054 Merge with default
--HG--
branch : multipass-stereo
2013-07-25 00:37:00 +02: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
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
dfighter1985
fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
2013-02-14 10:47:10 +01:00
kervala
ab838c00bf Fixed: revision target not being generated 2012-12-07 14:51:48 +01:00