Commit graph

284 commits

Author SHA1 Message Date
kervala 33115f61b2 Changed: Minor formatting 2013-08-05 10:34:38 +02:00
kervala f9b70173ce Fixed: PCH with Qt 5 and CMake 2.8.11 2013-08-05 10:32:17 +02:00
kervala e74913f589 Fixed: X64 not detected with CMake 2.8.11 2013-08-05 10:31:23 +02:00
kaetemi 9dc9acd68f Merge with default 2013-08-01 23:02:49 +02:00
kaetemi fd285cc703 Merge with default 2013-07-25 00:37:00 +02:00
StudioEtrange 31ba0013a6 PCHSupport.cmake edited online with Bitbucket 2013-07-24 21:57:52 +00:00
StudioEtrange 7b3381b997 Fix some probleme with spaces in path on windows
PCHSupport.cmake edited online with Bitbucket
2013-07-24 20:53:33 +00:00
StudioEtrange e7f468536a 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
2013-07-24 19:32:41 +00:00
StudioEtrange 8aa9192dbb nel.cmake edited online with Bitbucket 2013-07-24 19:31:10 +00:00
StudioEtrange 368750bafa 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
2013-07-24 19:22:38 +00:00
Michael Witrant 69c194f57f LibOVR is optional, and is disabled by default 2013-07-06 20:05:19 +02:00
Michael Witrant ed8e0edfd0 Added Win32 and Apple LibOVR build paths 2013-07-06 19:55:08 +02:00
Michael Witrant 67ebf920ec Added LibOVR finder and Linux support, ref #43 2013-07-06 19:33:07 +02:00
kaetemi ebba0c1917 Allow linking debug and release with same mysql lib if no specific debug lib. 2013-07-01 18:45:43 +02:00
kaetemi a06e106212 Allow compiling with shared libxml2 on Windows 2013-06-16 03:19:02 +02:00
kervala 5c307818fb 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 aa261f28a4 merging gui editor repo. 2013-02-14 09:53:06 -06:00
mattraykowski ed7b06835d Added another path for x86_64 Ubuntu 12.10 for libwww 2013-02-14 07:46:42 -06:00
dfighter1985 543488b490 Merged mainline default branch changes. 2013-02-14 10:47:10 +01:00
kervala 1bbf590ea6 Fixed: PCH finally working under Linux and Mac OS X (never worked before) 2012-12-08 11:34:39 +01:00
kervala c73e360370 Fixed: revision target not being generated 2012-12-07 14:51:48 +01:00
kervala 9ec8c40c65 Changed: Support for VC++ 2012
Changed: Improvements for iOS
Changed: Support for Android
2012-12-06 10:44:55 +01:00
kervala f3ab4249be Fixed: Detect and use Windows 8 SDK only under Visual C++ 2012 2012-12-06 10:23:04 +01:00
dfighter1985 421582d386 MODIFIED: #1471 Merged mainline default to this branch. 2012-11-25 05:22:40 +01:00
kervala affc4937c0 Fixed: Problem while parsing hg command line with a german locale 2012-11-04 17:10:26 +01:00
kervala ca0a9b8036 Fixed: revision.h error when hg executable not found 2012-10-22 14:56:25 +02:00
kervala eef7e53c13 Changed: Use of CMAKE_OSX_ARCHITECTURES to compile universal binaries under Mac OS X 2012-10-08 19:06:08 +02:00
kervala 19481e0e1d Changed: Don't use CMAKE_LIBRARY_ARCHITECTURE at all, because not reliable enough 2012-10-07 13:58:59 +02:00
kervala 0d382e9034 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 ad98304019 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 c202964108 Changed: #1444 Allow to provide custom revision.h 2012-10-02 13:12:13 +02:00
kervala 5e621fba15 Changed: Under Windows, install all files in the same folder excepted includes and libs 2012-09-26 12:51:11 +02:00
kervala 3429d7ba42 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 12:33:02 +02:00
kervala d45a4122b8 Fixed: #1254 Error while compiling with current stable squish 2012-09-25 12:19:13 +02:00
kervala 4613fdd8a6 Changed: #1493 Fixed absolute prefixes 2012-09-24 08:56:10 +02:00
kervala 003baa9140 Changed: #1493 Fixed absolute prefixes 2012-09-23 23:56:34 +02:00
kervala 51905e8b71 Fixed: #1493 Remove also -O flags from environment variables 2012-09-23 20:30:28 +02:00
kervala 38c5e6840d Fixed: #1493 MultiArch support 2012-09-22 22:57:38 +02:00
kervala 964630ddef Fixed: cmake Xcode project generation broken 2012-09-05 15:08:12 +02:00
dfighter1985 e24cffa79f Merged default branch into gui-refactoring. 2012-07-02 22:46:08 +02:00
kervala 6947138110 Fixed: Revision 0 bug 2012-05-19 23:25:06 +02:00
kervala baa2699228 Changed: Fix PCH for some cases under Mac OS X 2012-05-19 23:24:44 +02:00
kervala 0f85a895e8 Changed: Search CppTest headers in cpptest subfolder too 2012-05-13 16:24:34 +02:00
kervala b24255e0d1 Changed: Search MySQL headers in mysql subfolder too 2012-05-13 16:24:14 +02:00
kervala 41e103bc7a Changed: #1275 Added OpenGL ES CMake module 2012-05-13 16:23:48 +02:00
dfighter1985 c976419448 Created NELGUI library, moved the GUI event descriptors there. 2012-05-10 22:17:04 +02:00
kervala b1147e37b4 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 2b82f9a31c 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 3c1895960c merge 2012-04-18 11:08:44 -05:00
sfb 0320da86a6 Changed: Used a Regex to workaround the colon project name issue for VS10. 2012-04-18 11:07:01 -05:00
kervala c770ac0656 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 3a8b79be2b Changed: #1448 Compilation with Clang 2012-04-11 23:59:55 +02:00
kervala cace1c204a Fixed: Servers compilation if using static mysql library compiled with OpenSSL 2012-04-11 23:43:11 +02:00
kervala c3554b1651 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 9d834ab2e3 Changed: Remove cariage return in build date 2012-04-07 23:16:04 +02:00
kervala 3d854ce2bf Changed: Remove cariage return in build date 2012-04-07 22:47:03 +02:00
kervala 47bf2e82a4 Changed: Some checks for Clang and MinGW 2012-04-07 15:11:18 +02:00
kervala 5c66cbf374 Changed: #1448 Compilation with CLang (patch provided by GelluleX, thanks !) 2012-04-07 11:14:21 +02:00
kaetemi 0482aa9aac Fixed: Compile under Linux Mint 12 with GTK enabled. 2012-03-23 07:59:45 +01:00
kervala 09004ca004 Changed: #1444 Add details for user-agent 2012-03-15 00:15:03 +01:00
kervala bd69216544 Fixed: Compilation with WITH_STATIC_EXTERNAL under Mac OS X 2012-03-09 14:39:37 +01:00
kervala b7281e5cbe Fixed: #1447 PCH don't work anymore on Mac OS X 2012-03-09 09:31:13 +01:00
kervala a66e4ecd90 Fixed: #1321 Adopt WITH_STATIC_EXTERNAL for Mac OS X 2012-03-07 20:47:32 +01:00
kervala e3d0ed9c20 Changed: #1444 Add details for user-agent 2012-03-06 14:21:23 +01:00
sfb 12a20bd94c merge 2012-02-29 09:32:53 -06:00
kervala 2324932491 Changed: Support for Debian/Ubuntu multiarch (use -DCMAKE_LIBRARY_ARCHITECTURE=<multiarch>) 2012-02-27 15:19:53 +01:00
kervala 48d8e331a6 Changed: Fix again bad MSVC10 CMake generator... 2012-02-22 22:17:09 +01:00
kervala 874b39b05a Changed: Search in default paths if DXSDK_DIR is not defined 2012-02-21 17:47:16 +01:00
kervala 44e3c936e4 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 f3b9c7349f Changed: Allow to use external under Linux and Mac OS X 2011-09-10 18:45:54 +02:00
kervala 75f979fec8 Fixed: "relocation R_X86_64_32 against.." error when mixing static and shared libraries 2011-09-10 18:43:21 +02:00
kervala 285dea2f38 Changed: #1177 VS 2010 does not work under CMake 2011-08-19 16:58:18 +02:00
kaetemi 5cf4afdbde Merge 2011-08-13 23:44:22 +02:00
kaetemi 1651f8510b Fixed: #1333 Support 3ds Max 2012 SDK. 2011-08-13 23:36:37 +02:00
kervala 7daceb0f0e Fixed: #1329 Program received signal SIGSEGV, Segmentation fault. 2011-08-12 16:41:58 +02:00
kervala b8c26f1811 Changed: Remove libwww warnings under Windows 2011-08-11 10:09:30 +02:00
sfb bde302e7e3 Added: 3rd party library - Qt Property Browser 2.5 2011-08-03 07:51:10 -05:00
kervala a640676140 Added: Option WITH_STATIC_EXTERNAL to force FIND_LIBRARY to find static libs 2011-06-14 20:11:17 +02:00
kervala 191290528d Changed: #1177 VS 2010 does not work under CMake 2011-06-08 11:46:11 +02:00
kervala 59f6a344d4 Fixed: PCH problems with CMake 2.6 2011-06-03 13:59:08 +02:00
kervala 05eca7f726 Fixed: #1310 Broken build with VS 2k8 nmake 2011-06-03 10:07:52 +02:00
kervala 6ffe3fa569 Fixed: #1310 Broken build with VS 2k8 nmake 2011-06-03 09:23:12 +02:00
kervala 35a4beeec3 Added: VC++ flags to fix some warnings and errors 2011-05-29 17:54:58 +02:00
rti 9bcc675bca Added: FindIconv which is needed for a completely static client build on Mac OS X 2011-05-26 21:50:00 +02:00
kervala 3e5290add7 Changed: Minor changes in STLport CMake module 2011-05-24 20:25:39 +02:00
kervala fc8be41ad1 Changed: Added luabindd as luabind debug library name 2011-05-24 20:25:03 +02:00
kervala 5dd2caadf3 Changed: Use default FindZLIB.cmake module from CMake 2011-05-24 14:05:13 +02:00
kervala 87dbe3abc4 Fixed: Luabind detection when compiled from sources 2011-05-23 12:52:35 +02:00
kervala 65eaa95bf8 Fixed: #1297 CMake - improper detection architecture under linux (patch provided by Naush) 2011-05-20 21:32:31 +02:00
kervala 7edcf208d2 Changed: Replaced LIB_PREFIX by NL_LIB_PREFIX 2011-05-14 16:08:58 +02:00
kervala 2709cd0c10 Changed: Use of new variables to detect 64bits arch 2011-05-14 14:05:45 +02:00
kervala 6937e6977e Fixed: Didn't display any error when DirectX SDK was not found
Changed: Use of new variables to detect 64bits arch
2011-05-14 14:05:31 +02:00
kervala 144410cfd4 Changed: Some code simplifications 2011-05-14 14:04:03 +02:00
kervala bbbf8754fb Changed: Use of LIB_PREFIX only if defined
Changed: Compilation with all cores for VC++ 2008 and 2010
Changed: New method to determine the target CPU
2011-05-14 14:02:53 +02:00
kervala 1787101c66 Fixed: Use of Windows SDK 7.1 with VC++ 2010 if found 2011-05-14 13:58:39 +02:00
kervala 1324fc1093 Fixed: Some parameters were forgotten while compiling PCH 2011-05-14 13:56:25 +02:00
kervala 5d5f8a964f Fixed: #1177 VS 2010 does not work under CMake 2011-05-12 12:49:17 +02:00
kervala c51bc4ff70 Changed: #1275 Create an OpenGL ES driver 2011-05-01 17:01:11 +02:00
rti fed0f18b42 Fixed: Missing objdump binary name in CheckDepends.cmake 2011-04-13 19:58:41 +02:00
rti e1f07a5a1c Changed: #1109 archlinux libwww linker error 2011-04-12 20:08:35 +02:00
kervala c503b1859c Changed: #1251 NeL can't find selected drivers in CMake 2011-02-24 18:01:31 +01:00
kervala 5c972627a0 Fixed: Removed sound drivers from video macro and fixed libraries names 2011-02-24 15:37:55 +01:00
vl bb335bc3e2 Added: dwarf2 debug symbol format for mac 2011-02-18 09:10:37 +01:00
kervala 0b8820ca0c Fixed: Compilation under Linux with STLport 2011-02-11 18:05:19 +01:00
rti 1a3440374d Fixed: #1248 CMake Error: get_filename_component unknown component 2011-01-27 18:00:21 +01:00
kervala 9f0a8fc669 Changed: #878 Fix typos in comments/code 2011-01-22 22:18:33 +01:00
kervala fa5a0692af Changed: CMake compilation checks with STLport under Windows 2011-01-22 13:27:40 +01:00
kervala b6a6b540ed Fixed: CMake compilation checks with STLport 2011-01-22 13:26:19 +01:00
kervala 26dde15438 Changed: #1233 CMake doesn't find libwww under linux 2011-01-15 13:05:38 +01:00
kervala db888103a7 Changed: #878 Fix typos in comments/code 2010-12-30 12:22:39 +01:00
kervala 18785f0fbd Fixed: Compilation with luabind 0.7 (include luabind/version.hpp only when existing) 2010-12-30 12:20:42 +01:00
kervala a1637ee67f Fixed: CMake 2.6 error 2010-12-21 15:37:27 +01:00
rti d27395e287 Added: -pipe option to reduce disk usage while building 2010-12-18 18:14:00 +01:00
kervala 61a559da3c Changed: Use optimized and debug keywords only if both are found 2010-11-18 21:36:21 +01:00
kervala c53d70812d Changed: #1034 Implement CCustomMouse for Linux 2010-11-02 19:45:05 +01:00
vl b10e8789d6 Fixed: link order of the lib 2010-11-02 17:16:50 +01:00
aquiles fbda348725 Merge 2010-11-02 13:51:32 +01:00
aquiles a37a2afc1b Changed: Altered the CMakeList definition for Find3dsMaxSDK.cmake 2010-11-02 13:46:18 +01:00
kervala fe9d8dbd8a Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 13:36:12 +01:00
kervala df7805acc5 Fixed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 13:04:10 +01:00
kervala 49717a595a Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 12:51:35 +01:00
kervala 54c314474f Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 12:36:14 +01:00
kervala a3346aee4c Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 12:26:57 +01:00
kervala 23cb599505 Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 12:22:08 +01:00
kervala 8db1dbd3ac Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 12:18:02 +01:00
kervala 877bdecd7a Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 11:16:03 +01:00
kervala 0b8594f98d Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 11:00:17 +01:00
kervala a02356ccab Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 10:45:37 +01:00
kervala bb5bb9a24c Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-11-02 09:57:52 +01:00
kervala de43de750c Changed: #1152 FindLibwww does not make all needed libs link to ryzom_client 2010-10-31 22:15:49 +01:00
kervala ed9abbb2d5 Fixed: name_dir property for NeL and Ryzom libs under Mac OS X 2010-10-18 09:52:01 +02:00
kervala 258e16099c Fixed: Added /Zm1000 to be able to create PCH with a lot of headers 2010-10-18 09:51:06 +02:00
kervala feb8f901a3 Changed: Add another check for libwwww 2010-10-14 20:14:35 +02:00
kervala 30f5782a1d Changed: #1109 Checks for libwww dir 2010-10-10 23:04:39 +02:00
kervala f7446336de Fixed: #1109 Checks for libwww stream and dir modules 2010-10-04 21:09:38 +02:00
kervala 5026960cec Changed: #1111 Added commands for Mac OS 2010-10-03 18:23:38 +02:00
kervala 321269f81f Changed: #1109 archlinux libwww linker error 2010-10-03 11:39:04 +02:00
kervala c810f64a61 Changed: #1111 Create a CMake macro to check if we should link to an external lib or not 2010-10-03 10:04:36 +02:00
kervala d24279c6d6 Changed: #1111 Create a CMake macro to check if we should link to an external lib or not 2010-10-02 14:21:45 +02:00
kervala df31dee565 Changed: #878 Fix typos in comments/code 2010-10-02 11:44:05 +02:00
kervala cd870cea9c Changed: FindCppTest.cmake now can link to a specific STLport version of CppTest 2010-10-02 11:43:16 +02:00
kervala 7ebca53271 Fixed: #1114 Add a check for boost includes directory 2010-10-02 11:40:27 +02:00
kervala d16325bfd9 Fixed: Use of new CMAKE_*_OUTPUT_DIRECTORY 2010-10-01 12:45:54 +02:00
kervala 9d5fef3491 Fixed: Bad detection of MFC 2010-09-29 23:55:57 +02:00
kervala 6d9224dd60 Changed: Enable WITH_STLPORT by default under Windows (because we are providing external with STLport) 2010-09-28 15:37:52 +02:00
kervala fa213a58cc Changed: User can now have 2 externals: external and external_stlport, it will use the correct one 2010-09-28 15:27:32 +02:00
kervala fdd2259694 Changed: Make some options less verbose (MFC and Libwww) 2010-09-28 10:49:30 +02:00
kervala 056d087280 Fixed: PCH problem with GCC 2010-09-28 09:25:39 +02:00
kervala d15c631914 Fixed: Compilation with nmake and jom 2010-09-28 00:16:12 +02:00
kervala f88ded7ee0 Fixed: CMAKE_MAKE_PROGRAM or CMAKE_CXX_COMPILER can have relative path 2010-09-28 00:03:11 +02:00