Commit graph

205 commits

Author SHA1 Message Date
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 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: 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