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

355 commits

Author SHA1 Message Date
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
kervala
e67c6e9b1e Changed: Under Windows, install all files in the same folder excepted includes and libs 2012-09-26 12:51:11 +02:00
kervala
0795a61516 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 12:33:02 +02:00
kervala
fc8c26ff9f Fixed: #1254 Error while compiling with current stable squish 2012-09-25 12:19:13 +02:00
kervala
cb8cb918dd Changed: #1493 Fixed absolute prefixes 2012-09-24 08:56:10 +02:00
kervala
52d086fb8a Changed: #1493 Fixed absolute prefixes 2012-09-23 23:56:34 +02:00
kervala
6f480b4a87 Fixed: #1493 Remove also -O flags from environment variables 2012-09-23 20:30:28 +02:00
kervala
7a04e920e1 Fixed: #1493 MultiArch support 2012-09-22 22:57:38 +02:00
kervala
2f8b59e0ae Fixed: cmake Xcode project generation broken 2012-09-05 15:08:12 +02:00
dfighter1985
d301c46c27 Merged default branch into gui-refactoring. 
--HG--
branch : gui-refactoring
 2012-07-02 22:46:08 +02:00
kervala
09a163d76e Fixed: Revision 0 bug 2012-05-19 23:25:06 +02:00
kervala
dc8b368cfc Changed: Fix PCH for some cases under Mac OS X 2012-05-19 23:24:44 +02:00
kervala
318ae1e66c Changed: Search CppTest headers in cpptest subfolder too 2012-05-13 16:24:34 +02:00
kervala
9061d9a9b6 Changed: Search MySQL headers in mysql subfolder too 2012-05-13 16:24:14 +02:00
kervala
f7888cb7c9 Changed: #1275 Added OpenGL ES CMake module 2012-05-13 16:23:48 +02:00
dfighter1985
aed979a7fe Created NELGUI library, moved the GUI event descriptors there. 
--HG--
branch : gui-refactoring
 2012-05-10 22:17:04 +02:00
kervala
36b4d1a298 Added: Xcode checks and specific flags 
Changed: Target by default Mac OS X 10.6 if not specified
Changed: Add -isysroot, -arch and -mmacosx-version-min flags if needed
 2012-05-08 00:07:14 +02:00
kervala
15d2226427 Changed: Use only static libraries under Mac OS X if WITH_STATIC_EXTERNAL is used 
Changed: Strip binaries under Mac OS X by default in Release (use WITH_SYMBOLS if you don't want)
 2012-05-07 10:27:54 +02:00
sfb
a5de55c18d merge 2012-04-18 11:08:44 -05:00
sfb
c2e63b9d9d Changed: Used a Regex to workaround the colon project name issue for VS10. 2012-04-18 11:07:01 -05:00
kervala
8e70469541 Changed: Define Release configuration for compilation checks and as default if not defined (must be defined before PROJECT) 2012-04-12 16:01:38 +02:00
kervala
eeecc06601 Changed: #1448 Compilation with Clang 2012-04-11 23:59:55 +02:00
kervala
d0314c9e0e Fixed: Servers compilation if using static mysql library compiled with OpenSSL 2012-04-11 23:43:11 +02:00
kervala
0028303c35 Changed: Some Debian multiarch fixes 
Added: Option WITH_SYMBOLS to keep symbols when compiling in Release
 2012-04-11 15:30:38 +02:00
kervala
41747da931 Changed: Remove cariage return in build date 2012-04-07 23:16:04 +02:00
kervala
05d423ecdd Changed: Remove cariage return in build date 2012-04-07 22:47:03 +02:00
kervala
18e11b2867 Changed: Some checks for Clang and MinGW 2012-04-07 15:11:18 +02:00
kervala
425927cd50 Changed: #1448 Compilation with CLang (patch provided by GelluleX, thanks !) 2012-04-07 11:14:21 +02:00
kaetemi
7797e57737 Fixed: Compile under Linux Mint 12 with GTK enabled. 2012-03-23 07:59:45 +01:00
kervala
a48a7f06dd Changed: #1444 Add details for user-agent 2012-03-15 00:15:03 +01:00
kervala
b97eabc992 Fixed: Compilation with WITH_STATIC_EXTERNAL under Mac OS X 2012-03-09 14:39:37 +01:00
kervala
1ef105403c Fixed: #1447 PCH don't work anymore on Mac OS X 2012-03-09 09:31:13 +01:00
kervala
033c2ecf0e Fixed: #1321 Adopt WITH_STATIC_EXTERNAL for Mac OS X 2012-03-07 20:47:32 +01:00
kervala
c937df33ef Changed: #1444 Add details for user-agent 2012-03-06 14:21:23 +01:00
sfb
efa4fbdbf1 merge 2012-02-29 09:32:53 -06:00
kervala
17aded8877 Changed: Support for Debian/Ubuntu multiarch (use -DCMAKE_LIBRARY_ARCHITECTURE=<multiarch>) 2012-02-27 15:19:53 +01:00
kervala
7523a91fe1 Changed: Fix again bad MSVC10 CMake generator... 2012-02-22 22:17:09 +01:00
kervala
94aab791da Changed: Search in default paths if DXSDK_DIR is not defined 2012-02-21 17:47:16 +01:00
kervala
6306833423 Changed: New option WITH_INSTALL_LIBRARIES which allows user to install only final binaries and no development files (header, static libraries, etc...) 2011-09-11 14:44:37 +02:00
kervala
60ba938794 Changed: Allow to use external under Linux and Mac OS X 2011-09-10 18:45:54 +02:00
kervala
16383043d5 Fixed: "relocation R_X86_64_32 against.." error when mixing static and shared libraries 2011-09-10 18:43:21 +02:00
kervala
45eed67242 Changed: #1177 VS 2010 does not work under CMake 2011-08-19 16:58:18 +02:00
kaetemi
37b7c76d7b Merge 2011-08-13 23:44:22 +02:00
kaetemi
d98511337d Fixed: #1333 Support 3ds Max 2012 SDK. 2011-08-13 23:36:37 +02:00
kervala
9ea534f4f2 Fixed: #1329 Program received signal SIGSEGV, Segmentation fault. 2011-08-12 16:41:58 +02:00
kervala
bbc33e2bf9 Changed: Remove libwww warnings under Windows 2011-08-11 10:09:30 +02:00
sfb
bd2768ec89 Added: 3rd party library - Qt Property Browser 2.5 
--HG--
branch : branch_ovqt_3rdparty
 2011-08-03 07:51:10 -05:00
kervala
75ce27ad45 Added: Option WITH_STATIC_EXTERNAL to force FIND_LIBRARY to find static libs 2011-06-14 20:11:17 +02:00
kervala
b7eefef484 Changed: #1177 VS 2010 does not work under CMake 2011-06-08 11:46:11 +02:00