kervala
|
532aaa1078
|
Changed: Simplified CMake ELSE and ENDIF
|
2015-11-29 14:06:05 +01:00 |
|
kervala
|
b990a23095
|
Changed: Removed useless checks in config.h
|
2015-11-29 14:02:44 +01:00 |
|
kaetemi
|
df382464d8
|
Merge with feature-export-assimp
|
2015-11-16 00:46:27 +01:00 |
|
kervala
|
285ff45526
|
Changed: CMake end tags
|
2015-11-03 14:04:06 +01:00 |
|
kervala
|
f4e7edc836
|
Fixed: Wrong external detection (we don't use libwww anymore, so new external don't have it)
|
2015-11-03 14:03:46 +01:00 |
|
kervala
|
2d170378ab
|
Fixed: Wrong end tags
|
2015-11-01 17:04:59 +01:00 |
|
kervala
|
c77bbfc5e3
|
Changed: Support for Lua 5.3 (can be improved)
|
2015-11-01 17:04:41 +01:00 |
|
kervala
|
e436b954d0
|
Fixed: Don't add dependency on target revision if not defined
|
2015-10-25 15:16:29 +01:00 |
|
kervala
|
55150a8242
|
Fixed: GCC 5 version check fails for PCH support
|
2015-10-25 15:11:27 +01:00 |
|
kervala
|
fbbbf0c2eb
|
Fixed: Warnings with CMake
|
2015-10-06 20:31:41 +02:00 |
|
kervala
|
8225deee4e
|
Changed: Use less verbose version for ELSE(), ENDIF(), ENDFOREACH() and ENDMACRO()
|
2015-10-06 20:30:43 +02:00 |
|
kaetemi
|
681c1e089b
|
Add assimp dependency
|
2015-09-19 16:46:59 +02:00 |
|
kaetemi
|
80d4e91d74
|
Todo note
|
2015-07-10 06:33:14 +02:00 |
|
kaetemi
|
ab0aed948a
|
Fix DXSDK include order
|
2015-07-10 06:16:19 +02:00 |
|
kaetemi
|
e8e66df3cd
|
SDK 8.1 support
|
2015-07-10 05:50:05 +02:00 |
|
Nimetu
|
f3c99aa589
|
Remove libwww, only keep html entitites list
|
2015-04-17 15:10:00 +03:00 |
|
kaetemi
|
e2c3fc8968
|
Fix FindLibOVR cmake script
|
2015-02-24 17:17:45 +01:00 |
|
kaetemi
|
28a4989c17
|
Visual Studio 2013 compilation support for Ryzom Client
|
2015-02-20 18:10:06 +01:00 |
|
kaetemi
|
881bbc6083
|
Visual Studio 2013 compilation support for NLMISC
|
2015-02-20 16:24:19 +01:00 |
|
kervala
|
5221bf199c
|
Merge with hotfix
|
2015-02-14 14:31:19 +01:00 |
|
kervala
|
779492b262
|
Changed: Updated CMale modules
|
2015-02-14 13:47:37 +01:00 |
|
kervala
|
14046699bc
|
Fixed: Only keep Release and Debug configurations in CMake
|
2015-02-14 12:06:19 +01:00 |
|
dfighter1985
|
5537d4b627
|
Merged in hotfix (pull request #105)
Merge hotfix
|
2015-02-02 23:32:08 +01:00 |
|
dfighter1985
|
b5e9dfbc9e
|
Use release squish if debug not found. Fixes s3tc compressor tool build.
|
2015-02-02 23:25:11 +01:00 |
|
kervala
|
a728ae6b36
|
Changed: Allow to enable UAC for Windows client
|
2014-12-26 13:44:03 +01:00 |
|
kervala
|
25d1aa1d1f
|
Changed: Give priority to Luabind library filenames with specific Lua version
|
2014-12-26 13:43:20 +01:00 |
|
kervala
|
e4ab2467c1
|
Minor changes
|
2014-10-10 13:08:14 +02:00 |
|
nimetu
|
adf5cb28b5
|
find lua version for luabind under fedora
|
2014-09-30 11:23:16 +00:00 |
|
dfighter1985
|
8971f98722
|
Merged default.
|
2014-07-22 00:15:50 +02:00 |
|
kervala
|
0c3c9ca77a
|
Changed: Determinates 3dsmax SDK base directory
|
2014-07-19 14:04:19 +02:00 |
|
kervala
|
fab8d1d22f
|
Fixed: Give priority to fmod64 in 64 bits
|
2014-07-19 14:03:22 +02:00 |
|
kaetemi
|
d518f6b730
|
Add option for -mfpmath=both flag
|
2014-06-20 19:46:33 +02:00 |
|
kaetemi
|
ca8f75bea8
|
Add SSE3 compile flag if enabled
|
2014-06-20 18:51:34 +02:00 |
|
kaetemi
|
b9576c93dd
|
Merge with default
|
2014-06-20 03:01:32 +02:00 |
|
kaetemi
|
9f699b4923
|
Fix Snowballs compile under MinGW
|
2014-06-18 02:05:54 +02:00 |
|
kaetemi
|
5b47ca4709
|
Fix compilation of NLMISC under MinGW
|
2014-06-17 21:48:25 +02:00 |
|
kaetemi
|
3601168194
|
SSE2: Add CMake options
|
2014-06-13 19:00:24 +02:00 |
|
dfighter1985
|
9ee5a37ffd
|
Merged default
|
2014-05-14 18:01:15 +02:00 |
|
dfighter1985
|
f32545dda8
|
Moved ovqt to /code/studio
|
2014-05-06 01:30:28 +02:00 |
|
kervala
|
22374fb124
|
Fusion avec default
|
2014-04-24 19:16:42 +02:00 |
|
kervala
|
3d95fa2d71
|
Changed: Find DirectX libraries in alternative folders
|
2014-04-11 17:56:26 +02:00 |
|
kervala
|
c159b13f5b
|
Fixed: Used code being removed by -Wl,-x on Mac OS X
|
2014-03-27 13:03:38 +01:00 |
|
kervala
|
a38f20fba1
|
Fixed: Used code being removed by -Wl,-x on Mac OS X
|
2014-03-27 13:03:38 +01:00 |
|
kervala
|
3ed24c6955
|
Changed: Improvements in patch system
|
2014-03-22 16:23:17 +01:00 |
|
StudioEtrange
|
8c5094817b
|
fix find windows.h for winsdk8
|
2014-02-21 17:35:15 +01:00 |
|
StudioEtrange
|
9c37e0f077
|
Fix bug cannot find right include folder for winsdk8
|
2014-02-21 16:40:04 +01:00 |
|
kervala
|
4011c6c70c
|
Changed: Improvements in patch system
|
2014-03-22 16:23:17 +01:00 |
|
botanic
|
58c6b188d7
|
Added linux patcher!
|
2014-02-07 20:10:07 -08:00 |
|
botanic
|
777aa0b6ae
|
Add CMAKE option and NVIDIA PerfHUD support
|
2014-02-07 19:49:40 -08:00 |
|
kervala
|
cb5a600578
|
Fixed: Compilation with freetype under Linux
|
2014-02-01 13:59:47 +01:00 |
|
kervala
|
37d36e0ab5
|
Fixed: Compilation under Mac OS X 10.9
|
2014-01-30 14:43:51 +01:00 |
|
kervala
|
f256e78b2c
|
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
|
3fc3f584a3
|
Fixed: #96 cmake and freetype detection on Linux Debian SID
|
2014-01-22 10:24:35 +01:00 |
|
kervala
|
47bcf3504e
|
Fixed: Warning "LNK4224: /INCREMENTAL:YES is no longer supported"
|
2013-11-22 11:27:30 +01:00 |
|
kervala
|
4a46f42889
|
Changed: Manual -isysroot and -mmacosx-version-min useless because already set by CMake
|
2013-11-13 22:52:48 +01:00 |
|
kervala
|
48c6c213c6
|
Fixed: MFC can't be found
|
2013-10-30 20:46:19 +01:00 |
|
kervala
|
1e5fe9a8c1
|
Changed: Search for default installation paths under Windows
|
2013-10-21 17:50:21 +02:00 |
|
kervala
|
d2749d1857
|
Changed: Detect Express versions
|
2013-09-27 11:05:52 +02:00 |
|
kervala
|
3ab977f4d7
|
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
|
f6ddcacd56
|
Fixed: Windows SDK detection for some previous versions
|
2013-09-27 09:26:22 +02:00 |
|
kervala
|
2709a72e43
|
Fixed: LNK2011 when using external libraries
|
2013-09-26 22:50:13 +02:00 |
|
kervala
|
2af24d272b
|
Changed: Improved Windows SDK detection
|
2013-09-26 22:49:30 +02:00 |
|
kervala
|
725093587d
|
Changed: FIX_PRECOMPILED_HEADER now useless
|
2013-09-22 11:05:13 +02:00 |
|
kervala
|
482e37bed2
|
Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API
|
2013-09-22 10:47:12 +02:00 |
|
StudioEtrange
|
16b23da06b
|
FindMSVC fix
|
2013-09-21 14:14:29 +02:00 |
|
kaetemi
|
08f37643b7
|
Cleanup
|
2013-09-14 00:36:06 +02:00 |
|
kaetemi
|
7d0a84b2d1
|
Merge with default
|
2013-09-13 23:07:49 +02:00 |
|
kervala
|
e5423d5a3a
|
Changed: Look for Debug versions of libwww libraries
|
2013-09-08 12:53:35 +02:00 |
|
kervala
|
d5baba13e8
|
Changed: Look for Debug version of freetype and use it for Debug configuration
|
2013-09-08 10:26:23 +02:00 |
|
kaetemi
|
fca15bd084
|
Merge with default
|
2013-09-07 21:36:08 +02:00 |
|
StudioEtrange
|
3721135484
|
Merged ryzom/ryzomcore into default
|
2013-09-07 20:16:17 +02:00 |
|
kervala
|
6489e9e04f
|
Removed: S3TC module because not used anymore
|
2013-09-07 17:01:06 +02:00 |
|
StudioEtrange
|
93f9ca83f6
|
Merged ryzom/ryzomcore into default
|
2013-09-07 01:39:45 +02:00 |
|
kervala
|
b16d904bb2
|
Fixed: Use 32 bits libraries from Windows SDK in 64 bits
|
2013-09-06 14:48:21 +02:00 |
|
kervala
|
bfc65e70e7
|
Removed: DInput module because it's not used anymore
|
2013-09-06 14:44:03 +02:00 |
|
StudioEtrange
|
a4be8d565b
|
Merged ryzom/ryzomcore into default
|
2013-09-06 14:14:51 +02:00 |
|
kervala
|
08cf590b30
|
Added: Toolchains for Android and iOS
|
2013-09-06 13:38:19 +02:00 |
|
kervala
|
b26bf1a265
|
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
|
8cd8dcee5e
|
Changed: Use /X everytime with MSVC
|
2013-09-06 09:30:54 +02:00 |
|
kervala
|
9e042a5c67
|
Changed: Improved MFC module
|
2013-09-06 09:26:23 +02:00 |
|
kervala
|
b87aac1cc0
|
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
|
c87c99f6b2
|
Added: MSVC module to use later
|
2013-09-06 09:01:42 +02:00 |
|
kervala
|
5f4831f8b8
|
Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS
|
2013-09-06 09:00:33 +02:00 |
|
kervala
|
3833a51003
|
Changed: Display a message when compiling with NMake and define NMAKE
|
2013-09-06 08:58:36 +02:00 |
|
kervala
|
30a8cc1fe3
|
Changed: Factorized AMD/amd
|
2013-09-06 08:58:02 +02:00 |
|
kervala
|
3c3e25d523
|
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
|
ff444f42fa
|
Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases)
|
2013-09-06 08:43:44 +02:00 |
|
StudioEtrange
|
d951e1c452
|
** 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
|
a45299bfe5
|
Add support for LibVR
|
2013-08-28 08:08:22 +02:00 |
|
kaetemi
|
beb66b19b7
|
Merge with default
|
2013-09-07 16:25:45 +02:00 |
|
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 |
|