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