Commit Graph

75 Commits

Author SHA1 Message Date
click
30908638cb Core/Buildsystem: Set up mutliprocess compiles for all buildmodes (non-PCH/PCH with and without debugmodes)
--HG--
branch : trunk
2010-11-19 13:43:13 +01:00
click
3a18e4afcc Core/Buildsystem: Remove now deprecated WITH_SQLDEBUG option from CMake options (it's handled by the command added in r8ecf6a8816)
--HG--
branch : trunk
2010-11-19 13:19:03 +01:00
click
67fade84d3 Core/Commands: Enable SQL query logging by config and command )patch by leak)
Closes issue 4853.

--HG--
branch : trunk
2010-11-19 13:13:07 +01:00
Shauren
169c2ef87a Buildsystem/Windows: Added MySQL 5.5 registry paths to FindMySQL macro
--HG--
branch : trunk
2010-11-17 10:26:12 +01:00
click
ea847598d0 Buildsystem: Add initial support for Intel C++ Compiler (patch by Leak)
Note: Intel C++ Compiler for Windows is not supported in this change
Closes issue 4361

--HG--
branch : trunk
2010-10-21 22:00:12 +02:00
click
88f81d80a4 BuildSystem: Add XCode specific compiler handling in the OSX compile-instructions (_BUILD_DIRECTIVE gave error)
Update issue #4368
OSX/XCode compilation is not "fixed" as such untill a newew release of G3D is sorted. This is worked on from the G3D developers, and known.

--HG--
branch : trunk
2010-10-20 16:35:17 +02:00
click
059e5758ed BuildSystem: Fix a minor issue when using CMake-2.6.x to generate the buildfiles
(Thanks to A.Metaphysical.Drama for the report/fix)

--HG--
branch : trunk
2010-10-15 15:47:30 +02:00
click
607bc17d05 BuildSystem: Set the proper type of the cached revision-variable, so it doesn't show up in the CMake GUI
--HG--
branch : trunk
2010-10-15 00:55:31 +02:00
click
92a379da7f BuildSystem: Clean up the revision.h generation a tad bit
--HG--
branch : trunk
2010-10-14 23:47:59 +02:00
click
88f196f1a9 BuildSystem: Cache results from when pulling the revision-information to avoid regenerating revision.h
(should remove the unneeded rebuilding of some core-files due to that the revision.h file has changed timestamp-wise)

--HG--
branch : trunk
2010-10-14 22:48:55 +02:00
click
ce712adda2 Buildsystem: Clean up the revision.h target generation
- rename src/revision.h folder to src/genrev
- ensure BUILDDIR/revision.h file is cleared/removed before generation (deleted/recreated during buildmode-changes)
Note: This needs further testing, so please give feedback.

--HG--
branch : trunk
rename : src/revision.h/CMakeLists.txt => src/genrev/CMakeLists.txt
2010-10-08 22:11:47 +02:00
click
6e86977b16 Buildsystem: Fix minor typo
--HG--
branch : trunk
2010-10-07 22:37:13 +02:00
click
8832254c6d Buildsystem: Clean up uninstall-target files a bit
--HG--
branch : trunk
2010-10-07 21:34:13 +02:00
click
0ff3d8905e Buildsystem: Move uninstall-target for UNIX and OSX platforms
--HG--
branch : trunk
rename : cmake/platform/unix/cmake_uninstall.in.cmake => cmake/platform/cmake_uninstall.in.cmake
2010-10-07 20:05:46 +02:00
Shauren
729e618baa Buildsystem: Generate revision.h additionally during initial cmake run, also fixes displaying revision during run
--HG--
branch : trunk
2010-10-03 16:55:24 +02:00
Shauren
6c35c376e9 Buildsystem: Generating revision.h is now a part of build process (revision.h is back as target)
Buildsystem: Removed non-existing include directories

--HG--
branch : trunk
2010-10-03 16:30:22 +02:00
click
62b853e8ed BuildSystem: Fix missing variable parameter encapsulation for _BUILD_DIRECTIVE (gcc/xcode)
--HG--
branch : trunk
2010-09-30 13:04:46 +02:00
click
b87d8f4700 Buildsystem: Overhaul of the CMake buildsystem:
- utilize CMake for completely generating revision.h (kills off genrev and revision.h targets):
  - pull and set correct revision-ID/hash from Mercurial (hg) when using regular repository sourcetree
  - pull and set correct revision-ID/hash from archived releases (when pulled from googlecode)
  - set and use _BUILD_DIRECTIVE definition (earlier part of revision.h) as compiletime definition
- delete genrev and related buildsystems
  (now deprecated)
- Move some files around to adhere to buildsystem structure
Thanks to Shauren for figuring out the definition-behaviour for MSVC while he was in the shower

--HG--
branch : trunk
rename : cmake_uninstall.cmake.in => cmake/platform/unix/cmake_uninstall.in.cmake
2010-09-29 23:42:09 +02:00
click
f69c252f1d Buildsystem/Compilers: Adjust buildfiles slightly:
- Set SSE2 compile-flags only when used on 32-bit platforms (only used on x86 platforms, as x64 / Itanium has this as a standard)
- Clean up/merge some of the 64-bit/32-bit compiler options
- Clean up use of the PLATFORM variable (now sets PLATFORM 32 or PLATFORM 64, shaving off the CMAKE_SIZEOF_VOID_P test slightly)

--HG--
branch : trunk
2010-09-20 20:58:57 +02:00
click
58dafd94e2 BuildSystem/Platforms: Move platform-specific settings into respective directories, consistent with what is done with compilers.
BuildSystem/GCC: Add some additional parameters when using SFMT

--HG--
branch : trunk
2010-09-19 18:17:53 +02:00
click
726e5cf466 Buildsystem/Core: Add new build-flag WITH_SQLDEBUG - adds support for enabling/disabling SQL-query logging
--HG--
branch : trunk
2010-09-17 20:36:29 +02:00
click
2279102ec9 BuildSystem: Make dep/* sources muted during compile (3rd party sources should not show messages during compile, as we're not responsible for them)
Note: Certain functions called within the main src/ subdir will warn due to that we do not ignore them in the CMakeLists.txt yet.
This will be properly handled at an opportune moment.
Buildsystem/CMake: Set default warninglevel to 0 (no warnings shown during compile) - some warnings will still show while we create the "mutelist"

--HG--
branch : trunk
2010-09-12 18:32:49 +02:00
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