Commit Graph

361 Commits (630ae259ad216bd61f161be31e9734eb4351d6b8)

Author SHA1 Message Date
kaetemi 9a10f1413b Fix DXSDK include order
--HG--
branch : develop
9 years ago
kaetemi cac661dbca SDK 8.1 support
--HG--
branch : develop
9 years ago
Nimetu be95880a95 Remove libwww, only keep html entitites list
--HG--
branch : develop
10 years ago
kaetemi 72475cf719 Fix FindLibOVR cmake script
--HG--
branch : develop
10 years ago
kaetemi a8db3b2dda Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
10 years ago
kaetemi 6db8abf95c Visual Studio 2013 compilation support for NLMISC
--HG--
branch : develop
10 years ago
kervala e8b0765e7c Merge with hotfix
--HG--
branch : develop
10 years ago
kervala e0c95a74af Changed: Updated CMale modules
--HG--
branch : hotfix
10 years ago
kervala eb5fecf8ce Fixed: Only keep Release and Debug configurations in CMake
--HG--
branch : hotfix
10 years ago
dfighter1985 972d270bfc Merged in hotfix (pull request #105)
Merge hotfix

--HG--
branch : develop
10 years ago
dfighter1985 bdb633cf83 Use release squish if debug not found. Fixes s3tc compressor tool build.
--HG--
branch : hotfix
10 years ago
kervala ec12e6a75e Changed: Allow to enable UAC for Windows client
--HG--
branch : develop
10 years ago
kervala f745f82455 Changed: Give priority to Luabind library filenames with specific Lua version
--HG--
branch : develop
10 years ago
kervala e34ba83f26 Minor changes
--HG--
branch : develop
10 years ago
nimetu dcf2906b94 find lua version for luabind under fedora
--HG--
branch : nimetu/find-lua-version-for-luabind-under-fedor-1412076128442
10 years ago
dfighter1985 8373118c7e Merged default.
--HG--
branch : gsoc2014-dfighter
10 years ago
kervala 38f79138b9 Changed: Determinates 3dsmax SDK base directory 10 years ago
kervala 1ace2090fb Fixed: Give priority to fmod64 in 64 bits 10 years ago
kaetemi 5312547295 Add option for -mfpmath=both flag 11 years ago
kaetemi ed5721a79b Add SSE3 compile flag if enabled 11 years ago
kaetemi ac3e69b8ab Merge with default
--HG--
branch : sse2
11 years ago
kaetemi 9838ef56de Fix Snowballs compile under MinGW 11 years ago
kaetemi 3dd11fe157 Fix compilation of NLMISC under MinGW 11 years ago
kaetemi 4ed37ac68e SSE2: Add CMake options
--HG--
branch : sse2
11 years ago
dfighter1985 12890373a4 Merged default
--HG--
branch : gsoc2014-dfighter
11 years ago
dfighter1985 91f859bc8a Moved ovqt to /code/studio
--HG--
branch : gsoc2014-dfighter
11 years ago
kervala 24fa8df5ff Fusion avec default
--HG--
branch : compatibility
11 years ago
kervala 5a88951837 Changed: Find DirectX libraries in alternative folders
--HG--
branch : compatibility
11 years ago
kervala a8c35f9229 Fixed: Used code being removed by -Wl,-x on Mac OS X 11 years ago
kervala f62b19eb71 Fixed: Used code being removed by -Wl,-x on Mac OS X
--HG--
branch : compatibility
11 years ago
kervala 6c4d33c2a6 Changed: Improvements in patch system 11 years ago
StudioEtrange 994c47dc92 fix find windows.h for winsdk8
--HG--
branch : cmake-fixes
11 years ago
StudioEtrange 646b8fc9ae Fix bug cannot find right include folder for winsdk8
--HG--
branch : cmake-fixes
11 years ago
kervala 20ce763f35 Changed: Improvements in patch system
--HG--
branch : compatibility
11 years ago
botanic 666ab7ebec Added linux patcher! 11 years ago
botanic e728daa7cd Add CMAKE option and NVIDIA PerfHUD support 11 years ago
kervala 3980513e12 Fixed: Compilation with freetype under Linux 11 years ago
kervala 1c50b1f943 Fixed: Compilation under Mac OS X 10.9 11 years ago
kervala a5a9532a13 Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h) 11 years ago
kervala ee8edac294 Fixed: #96 cmake and freetype detection on Linux Debian SID 11 years ago
kervala 19f7bc931e Fixed: Warning "LNK4224: /INCREMENTAL:YES is no longer supported" 11 years ago
kervala 98c862136a Changed: Manual -isysroot and -mmacosx-version-min useless because already set by CMake 11 years ago
kervala 588d262dbf Fixed: MFC can't be found 11 years ago
kervala 28b9fbe8bc Changed: Search for default installation paths under Windows 11 years ago
kervala bc8490adb7 Changed: Detect Express versions 11 years ago
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
11 years ago
kervala 4fee35c5b3 Fixed: Windows SDK detection for some previous versions 11 years ago
kervala 65d9c70cd9 Fixed: LNK2011 when using external libraries 11 years ago
kervala 03201f979f Changed: Improved Windows SDK detection 11 years ago
kervala c7deb1b0c4 Changed: FIX_PRECOMPILED_HEADER now useless 11 years ago
kervala 3294955c60 Fixed: #55 ryzom_client crashes on start with unprotected error in call to Lua API 11 years ago
StudioEtrange d81c9db04e FindMSVC fix 11 years ago
kaetemi 973215e1d0 Cleanup
--HG--
branch : multipass-stereo
11 years ago
kaetemi d2bc32e598 Merge with default
--HG--
branch : multipass-stereo
11 years ago
kervala 11dd2bc101 Changed: Look for Debug versions of libwww libraries 11 years ago
kervala 17ebe78cf6 Changed: Look for Debug version of freetype and use it for Debug configuration 11 years ago
kaetemi 0a3f3f1760 Merge with default
--HG--
branch : multipass-stereo
11 years ago
StudioEtrange 3121a83730 Merged ryzom/ryzomcore into default 11 years ago
kervala 9dccf31863 Removed: S3TC module because not used anymore 11 years ago
StudioEtrange fec561914d Merged ryzom/ryzomcore into default 11 years ago
kervala 37fa1fa1ec Fixed: Use 32 bits libraries from Windows SDK in 64 bits 11 years ago
kervala d196f05b7e Removed: DInput module because it's not used anymore 11 years ago
StudioEtrange d2530f6894 Merged ryzom/ryzomcore into default 11 years ago
kervala f2bc8f3c8c Added: Toolchains for Android and iOS 11 years ago
kervala 3988120c55 Changed: Allows to choose a specific Windows SDK version with WINSDK_VERSION
Changed: Look for all installed Windows SDKs
11 years ago
kervala 6ddf4786ff Changed: Use /X everytime with MSVC 11 years ago
kervala 3a7cee4aa7 Changed: Improved MFC module 11 years ago
kervala 4a4b9b5ab8 Changed: Detect hg binary under Mac OS X if /opt/local/bin is not in PATH 11 years ago
kervala 651065e4ed Added: MSVC module to use later 11 years ago
kervala a71f08274e Changed: Use PLATFORM_LINKFLAGS in *_LINKER_FLAGS 11 years ago
kervala 969d9a057d Changed: Display a message when compiling with NMake and define NMAKE 11 years ago
kervala a52df4c710 Changed: Factorized AMD/amd 11 years ago
kervala 26679e767e Changed: Allow to put a "revision" file in root directory if .hg directory is not present 11 years ago
kervala 3e4a567d6a Fixed: Don't use -fPIC and -fPIE together (this could occur in some cases) 11 years ago
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
11 years ago
Thibaut Girka ea8a845ab9 Add support for LibVR
--HG--
branch : multipass-stereo
11 years ago
kaetemi 7782576dfc Merge with default
--HG--
branch : multipass-stereo
11 years ago
kervala f680e3943d Changed: Minor formatting 11 years ago
kervala a41ba055a5 Fixed: PCH with Qt 5 and CMake 2.8.11 11 years ago
kervala c792c423db Fixed: X64 not detected with CMake 2.8.11 11 years ago
kaetemi 96b2df8405 Merge with default
--HG--
branch : multipass-stereo
11 years ago
kaetemi 1e9771d054 Merge with default
--HG--
branch : multipass-stereo
11 years ago
StudioEtrange 0efa7c8aee PCHSupport.cmake edited online with Bitbucket
--HG--
branch : StudioEtrange/fix-some-probleme-with-spaces-in-path-on-1374699208398
11 years ago
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
11 years ago
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
11 years ago
StudioEtrange 885a39ad7e nel.cmake edited online with Bitbucket
--HG--
branch : StudioEtrange/nelcmake-edited-online-with-bitbucket-1374694264640
11 years ago
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
11 years ago
Michael Witrant a33a0e5c56 LibOVR is optional, and is disabled by default
--HG--
branch : multipass-stereo
12 years ago
Michael Witrant 0036b5c619 Added Win32 and Apple LibOVR build paths
--HG--
branch : multipass-stereo
12 years ago
Michael Witrant c60bd3e3f5 Added LibOVR finder and Linux support, ref #43
--HG--
branch : multipass-stereo
12 years ago
kaetemi fba17e4553 Allow linking debug and release with same mysql lib if no specific debug lib.
--HG--
branch : multipass-stereo
12 years ago
kaetemi 8629f069ae Allow compiling with shared libxml2 on Windows 12 years ago
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) 12 years ago
mattraykowski e7e51f01e0 merging gui editor repo. 12 years ago
mattraykowski 3f97c5afbd Added another path for x86_64 Ubuntu 12.10 for libwww 12 years ago
dfighter1985 fcb736c387 Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
12 years ago
kervala b330b46ee3 Fixed: PCH finally working under Linux and Mac OS X (never worked before) 12 years ago
kervala ab838c00bf Fixed: revision target not being generated 12 years ago
kervala f4b72eab54 Changed: Support for VC++ 2012
Changed: Improvements for iOS
Changed: Support for Android
12 years ago
kervala b4d9e2bfdd Fixed: Detect and use Windows 8 SDK only under Visual C++ 2012 12 years ago
dfighter1985 cb13ce46cd MODIFIED: #1471 Merged mainline default to this branch.
--HG--
branch : gsoc2012-gui-editor
12 years ago
kervala ff18f8f0ec Fixed: Problem while parsing hg command line with a german locale 12 years ago
kervala 2e6361ebfe Fixed: revision.h error when hg executable not found 12 years ago
kervala b421b38def Changed: Use of CMAKE_OSX_ARCHITECTURES to compile universal binaries under Mac OS X 12 years ago
kervala 3c19f1a2f4 Changed: Don't use CMAKE_LIBRARY_ARCHITECTURE at all, because not reliable enough 12 years ago
kervala af4ed15c36 Changed: CXXFLAGS and CPPFLAGS support in CMake
Changed: Use LIBRARY_ARCHITECTURE to override CMAKE_LIBRARY_ARCHITECTURE
12 years ago
kervala 122fef354c Changed: Don't check Debian environment variables in CMake scripts (define options on cmake command-line instead) 12 years ago
kervala 4a1df6eb66 Changed: #1444 Allow to provide custom revision.h 12 years ago
kervala e67c6e9b1e Changed: Under Windows, install all files in the same folder excepted includes and libs 12 years ago
kervala 0795a61516 Changed: #825 Remove all warnings when compiling Ryzom 12 years ago
kervala fc8c26ff9f Fixed: #1254 Error while compiling with current stable squish 12 years ago
kervala cb8cb918dd Changed: #1493 Fixed absolute prefixes 12 years ago
kervala 52d086fb8a Changed: #1493 Fixed absolute prefixes 12 years ago
kervala 6f480b4a87 Fixed: #1493 Remove also -O flags from environment variables 12 years ago
kervala 7a04e920e1 Fixed: #1493 MultiArch support 12 years ago
kervala 2f8b59e0ae Fixed: cmake Xcode project generation broken 12 years ago
dfighter1985 d301c46c27 Merged default branch into gui-refactoring.
--HG--
branch : gui-refactoring
13 years ago
kervala 09a163d76e Fixed: Revision 0 bug 13 years ago
kervala dc8b368cfc Changed: Fix PCH for some cases under Mac OS X 13 years ago
kervala 318ae1e66c Changed: Search CppTest headers in cpptest subfolder too 13 years ago
kervala 9061d9a9b6 Changed: Search MySQL headers in mysql subfolder too 13 years ago
kervala f7888cb7c9 Changed: #1275 Added OpenGL ES CMake module 13 years ago
dfighter1985 aed979a7fe Created NELGUI library, moved the GUI event descriptors there.
--HG--
branch : gui-refactoring
13 years ago
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
13 years ago
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)
13 years ago
sfb a5de55c18d merge 13 years ago
sfb c2e63b9d9d Changed: Used a Regex to workaround the colon project name issue for VS10. 13 years ago
kervala 8e70469541 Changed: Define Release configuration for compilation checks and as default if not defined (must be defined before PROJECT) 13 years ago
kervala eeecc06601 Changed: #1448 Compilation with Clang 13 years ago
kervala d0314c9e0e Fixed: Servers compilation if using static mysql library compiled with OpenSSL 13 years ago
kervala 0028303c35 Changed: Some Debian multiarch fixes
Added: Option WITH_SYMBOLS to keep symbols when compiling in Release
13 years ago
kervala 41747da931 Changed: Remove cariage return in build date 13 years ago
kervala 05d423ecdd Changed: Remove cariage return in build date 13 years ago
kervala 18e11b2867 Changed: Some checks for Clang and MinGW 13 years ago
kervala 425927cd50 Changed: #1448 Compilation with CLang (patch provided by GelluleX, thanks !) 13 years ago
kaetemi 7797e57737 Fixed: Compile under Linux Mint 12 with GTK enabled. 13 years ago
kervala a48a7f06dd Changed: #1444 Add details for user-agent 13 years ago
kervala b97eabc992 Fixed: Compilation with WITH_STATIC_EXTERNAL under Mac OS X 13 years ago
kervala 1ef105403c Fixed: #1447 PCH don't work anymore on Mac OS X 13 years ago
kervala 033c2ecf0e Fixed: #1321 Adopt WITH_STATIC_EXTERNAL for Mac OS X 13 years ago
kervala c937df33ef Changed: #1444 Add details for user-agent 13 years ago
sfb efa4fbdbf1 merge 13 years ago
kervala 17aded8877 Changed: Support for Debian/Ubuntu multiarch (use -DCMAKE_LIBRARY_ARCHITECTURE=<multiarch>) 13 years ago
kervala 7523a91fe1 Changed: Fix again bad MSVC10 CMake generator... 13 years ago
kervala 94aab791da Changed: Search in default paths if DXSDK_DIR is not defined 13 years ago
kervala 6306833423 Changed: New option WITH_INSTALL_LIBRARIES which allows user to install only final binaries and no development files (header, static libraries, etc...) 13 years ago
kervala 60ba938794 Changed: Allow to use external under Linux and Mac OS X 13 years ago
kervala 16383043d5 Fixed: "relocation R_X86_64_32 against.." error when mixing static and shared libraries 13 years ago
kervala 45eed67242 Changed: #1177 VS 2010 does not work under CMake 13 years ago
kaetemi 37b7c76d7b Merge 13 years ago