Commit Graph

53 Commits

Author SHA1 Message Date
click
3b91ce95a6 BuildSystem: Sort out issues with mysql-libraries under *nix (and should now also work properly for Win32)
- Rename the "EXTERNAL_MYSQL" flag to "USE_MYSQL_SOURCES" to reflect it's PROPER use (and ensure that it's ONLY used on Win32)
- Remove a lingering "scripts" definition (the "scripts"-target is always included, but only from compiled parts (broke builds with -DSCRIPTS=0)

--HG--
branch : trunk
2010-09-08 19:20:38 +02:00
runningnak3d
a9d5e03343 BuildSystem/Linux: Fix using internal MySQL headers when EXTERNAL_MYSQL not
specified

--HG--
branch : trunk
2010-09-08 09:18:00 -06:00
click
a5d628ef3e BuildSystem: Fix another logic-error in the Win32-specific settings
--HG--
branch : trunk
2010-09-08 14:54:28 +02:00
click
4faf53881f BuildSystem/Macros: Revert FindMySQL.cmake changes from ea96a5d888 - handled with simple if-tests instead
BuildSystem: Adjust buildfiles so that they reflect their proper parameters (will change when we've cleaned it up even more)

--HG--
branch : trunk
2010-09-08 14:40:45 +02:00
Xanadu
220c207294 BuildSystem/Windows: * Added 5.1.50 (GA) MySQL client sources for crosscompiling (or lazy) windows people.
* Added an option to autosearch for your own installed MySQL as before. Note that default setting is to use the internal MySQL.
* You can now build 32-bit even if your MySQL is x64 and vice versa.
* Recommended MySQL server version for use with provided MySQL client sources is 5.1.x.
* If your server version is different, let CMake autofind and use it instead (check EXTERNAL_MYSQL option)

--HG--
branch : trunk
2010-09-07 01:26:57 +02:00
Xanadu
62673ec25e Fixed win x64 debug build. Thx to click for inspiration.
--HG--
branch : trunk
2010-09-06 02:36:54 +02:00
click
174f2884b7 Buildsystem/MSVC: Only use /bigobj on x64 platforms - should solve x86 debug compilations (needs feedback)
--HG--
branch : trunk
2010-08-31 20:14:16 +02:00
click
511d571d25 Buildsystem: Clean up target link-definitions a bit
--HG--
branch : trunk
2010-08-30 22:58:37 +02:00
click
8d0f2f8a31 Buildsystem/MSVC: Correct 'bigobj' flag to lowercase
--HG--
branch : trunk
2010-08-30 18:29:39 +02:00
click
b0d85ac185 Buildsystem/MSVC: Reinstate regular flags, seems like C++-flags and C-flags doesn't mix very well on MSVC
--HG--
branch : trunk
2010-08-30 11:50:48 +02:00
click
b53cec3d5b Buildsystem/MSVC: Ensure same compileoptions for both CXX and C objects
--HG--
branch : trunk
2010-08-30 11:22:54 +02:00
click
135a026eff Buildsystem/MSVC: Enable bigobject support for debug-compiles
--HG--
branch : trunk
2010-08-30 11:08:32 +02:00
click
6f46a62bd3 Buildsystem/OSX: Properly set CONF_DIR and LIBSDIR (feedback needed)
Fixes issue 3703

--HG--
branch : trunk
2010-08-30 10:54:22 +02:00
click
9648cf7f39 Buildsystem: Make MSVC behave a wee bit better :
- Overload standard names with "secure" versions
- Disable "non-secure" warnings by default
- Disable POSIX-warnings by default

--HG--
branch : trunk
2010-08-29 12:56:34 +02:00
click
2bfaeaeabe Buildsystem: Make the Readline-test NOT behave like a "callable" macro - Find* functions are ALWAYS to be considered first in line when called
--HG--
branch : trunk
2010-08-28 22:02:38 +02:00
click
cf841c8337 Buildsystem: Split out the resultlist from the options, and print it AFTER we've grabbed all the settings
--HG--
branch : trunk
2010-08-28 21:51:28 +02:00
click
3fa20f4cf3 Buildsystem: Make options load BEFORE platformchecks, so they are preloaded correctly
+ add some more output to make it easier to find possible issues with the new layout

--HG--
branch : trunk
2010-08-28 21:42:07 +02:00
click
dcaeceaf6b Buildsystem: Change over to a little more flexible method of using the CMake buildsystem (partially WIP) - REQUIRES RERUNNING CMAKE!
For finding out the "standard" parameters examine the cmake/options.cmake file and adjacent files for your platform/compiler.
For platform settings -> cmake/platform/*/settings.cmake
For compiler settings -> cmake/compiler/*/settings.cmake
Some more testing and changes IS required, but I don't have OSX/XCode to kill off the main issues

--HG--
branch : trunk
rename : cmake/FindPlatform.cmake => cmake/macros/CheckPlatform.cmake
rename : cmake/FindACE.cmake => cmake/macros/FindACE.cmake
rename : cmake/FindMySQL.cmake => cmake/macros/FindMySQL.cmake
rename : cmake/FindOpenSSL.cmake => cmake/macros/FindOpenSSL.cmake
rename : cmake/FindPCHSupport.cmake => cmake/macros/FindPCHSupport.cmake
rename : cmake/FindReadline.cmake => cmake/macros/FindReadline.cmake
rename : cmake/cmake_uninstall.cmake.in => cmake_uninstall.cmake.in
2010-08-28 18:49:17 +02:00
click
3aa117c9b0 Buildsystem: Make SSE-variables "advanced" so that they don't confuse people more than needed (will not show unless 'advanced' is ticked in the GUI)
--HG--
branch : trunk
2010-08-27 19:38:28 +02:00
click
a470c91bf0 Buildsystem/Macro: Use the correct number for Allendale-CPUs and fix a minor typo
--HG--
branch : trunk
2010-08-20 10:11:37 +02:00
click
6aa1731198 Buildsystem/Macro: Add support for Intel Family 6 Model 30 (Allendale) CPU optimizations (Based on Westmere)
--HG--
branch : trunk
2010-08-20 10:02:01 +02:00
azazel
acc43ea47d Buildsystem: add missing argument to macro. Fixes CMake issues on Win
--HG--
branch : trunk
2010-08-20 12:08:12 +06:00
click
8d62f4e6ce Buildsystem: Add helperscripts to detect SSE2 extensions, and optimize platform compileflags for the architecture
+ minifix in scripts (wrong includedir)

--HG--
branch : trunk
2010-08-20 04:09:39 +02:00
click
916c7f09f8 Buildsystem/Linux: Deprecate and remove use of FindTermcap.cmake - it was only used as a solution for older CentOS versions
Core/Genrevision: Move defines from SystemConfig.h file into into revision.h (might need a rename now?) and delete it.
This should remove the infamous "rebuild all of game plzkthx"-symptom when upgrading to newer revisions.

--HG--
branch : trunk
2010-08-14 21:28:00 +02:00
click
2528e6e764 Fix typo in previous commit
--HG--
branch : trunk
2010-08-14 18:06:32 +02:00
click
d86a0e5060 Core: Remove some useless defines (handled in the configfiles)
--HG--
branch : trunk
2010-08-14 17:02:11 +02:00
click
362a1eed51 Buildsystem/Windows: Add environment-based directories to MySQL search-paths
--HG--
branch : trunk
2010-08-14 08:39:44 +02:00
click
9a8342abb7 Buildsystem: Make core buildable under Windows again
- changed OpenSSL detection of headers around slightly
- changed paths to MySQL-headers on Windows in a few files
- removed precompiled header for scripts being built when building game
- added requirement of building revision.h to be built before building shared
- added some generic buildfixes (thanks zor)
- use resource-files, allowing for icons to show up on windows

--HG--
branch : trunk
2010-08-08 03:33:21 +02:00
click
6baf3f9a59 Buildsystem/CMake: Adjust headerlocations on Windows so that they are correctly detected.
- Remove caching of OpenSSL info (for you, zor!)
- Adjust MySQL header-location in a DB-file (haha to Machiavelli, more work for you!)
- Add OpenSSL-header location to the shared-library (Fixes build)

--HG--
branch : trunk
2010-08-07 21:48:20 +02:00
click
cc51206403 Use proper paths for searching
--HG--
branch : trunk
2010-06-30 23:35:45 +02:00
Shauren
c0dfc791de OpenSSL windows detection
You have to have x64 version of the library to build in x64 mode (and x86 for win32 build) - affects only windows

--HG--
branch : trunk
2010-06-30 23:14:50 +02:00
click
d405f3fca5 Add CMake platform-check (32/64-bit) (includes new test-variable ${PLATFORM} that defines X86/X64 basesystem)
--HG--
branch : trunk
2010-06-30 14:39:21 +02:00
Shauren
2ea043484d It is now possible to use CMake on windows for proper build (PCH support included)
Merged PCH header into gamePCH since they became the same after these changes

--HG--
branch : trunk
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h
2010-06-30 13:10:13 +02:00
click
35aa050db8 Temporary fix linux build (back to cmake 2.6.0 standards untill a better solution is found)
+ clean up the base cmakelists.txt a bit
+ remove a GCC-warning when attempting build from a CMake-generated VS-project/solution

--HG--
branch : trunk
2010-06-24 15:08:01 +02:00
Shauren
a5a2676e88 Fixed OpenSSL cmake detection for x64 windows
--HG--
branch : trunk
2010-06-24 12:37:08 +02:00
Brian
bc704b4a55 * Fix logic in FindMySQL cmake file
* *nix compiles again

--HG--
branch : trunk
2010-06-17 10:29:53 -06:00
click
d027d64f2f Fix issue where the MySQL library/include searchmacro wouldn't detect the MySQL-libraries/headers - it now respects the result from mysql_config properly
--HG--
branch : trunk
2010-06-17 01:17:33 +02:00
click
b637ddf1ce Tempfix for detecting the threadsafe mysl-library (the detectionroutine needs to properly use mysql_config if available, and for some odd reason it doesn't)
--HG--
branch : trunk
2010-06-17 00:22:12 +02:00
Xanadu
560f3bb87b Added OpenSSL registry path for win 7 x64.
--HG--
branch : trunk
2010-06-16 06:41:57 +02:00
click
5d7bed7222 Adjust CMake "searchmacros" bit so that they point to correct locations
--HG--
branch : trunk
2010-06-16 03:43:09 +02:00
Shauren
05178900db Add support for detecting openssl with cmake using registry (windows)
--HG--
branch : trunk
2010-06-15 20:06:05 +02:00
click
d63b601f61 First part of supporting CMake under Windows - this is WIP, and if you want to work on it, be on IRC.
This is NOT a complete product, but we need all hands on deck to get this sorted out ASAP, and as such we throw it in.
No changes are done to Windows buildmethods untill this is -completed- and -working-.

--HG--
branch : trunk
2010-06-15 19:19:17 +02:00
click
b232204264 Remove old DO_MYSQL-params in CMakeLists.txt files - not required as we only support MySQL anyway
+ add partial support for finding headers on Windows (not yet done)

--HG--
branch : trunk
2010-06-14 02:00:30 +02:00
click
d607693123 Add proper use of precompiled headers on linux - this removes an approx 50% reduction of total compiletime
--HG--
branch : trunk
2010-05-18 00:17:14 +02:00
click
cb84d3e617 Cleanup : Remove postgreSQL-support (not used and has also been broken for a long time)
--HG--
branch : trunk
2010-05-06 09:53:09 +02:00
Kudlaty
8821a09832 Some cosmetic change in cmake files
--HG--
branch : trunk
2009-09-06 05:23:33 +02:00
Kudlaty
b9208e371c Fix typo
--HG--
branch : trunk
2009-09-06 00:41:23 +02:00
Kudlaty
b6e694ab68 Add macro for finding Termcap with cmake, and some cleaning about readline
--HG--
branch : trunk
2009-09-06 00:39:13 +02:00
Kudlaty
7fa1036c08 Fix cmake -i when we specify own dir for ACE
--HG--
branch : trunk
2009-07-25 16:59:24 +02:00
Kudlaty
e1c2d50796 Fix build on windows and propably on centos
--HG--
branch : trunk
2009-07-25 14:36:42 +02:00