Commit Graph
92 Commits
Author SHA1 Message Date
click 780ed1b01c Buildsystem: Clean up build-process on all platforms
- Windows: Use CMAKE_INSTALL_PREFIX as a 'final install' directory (thanks to paradox for the preload-handling)
  (New target INSTALL, -not- included as part of ALL_BUILD (must be specifically run for installation to start)
- All: Build libmpq library (used for tools)
- All: Build extractiontools with hardlinked mpq-library (no need to install it anymore)
- All: Move jemalloc from being harddefined to using a CMake string (fixes issue 3378) (thanks to tru.bazoozoo for the idea, alternative added)

--HG--
branch : trunk
2010-08-11 20:55:14 +02:00
click 3002300e71 Backed out changeset 2f79fd19c2c5 - needs some more thought, sorry - I promise it will work better once I got it sorted properly!
--HG--
branch : trunk
2010-08-10 23:11:40 +02:00
click 29e152f42b Buildsystem/Windows: Use CMAKE_INSTALL_PREFIX as result-dir for output (Thanks to Paradox)
(Suggested change for genrevisions default path retained to avoid breaking earlier builds, and it's not really a "server binary")
Fixes issue 3366

--HG--
branch : trunk
2010-08-10 22:40:34 +02:00
click 4f9ec558f4 Buildsystem/Linux: Remove -DCENTOS flag and enforce linking with ncurses in case of older revisions of CentOS (thanks to QAston and vaska94/kingwee)
Closes issue 2908

--HG--
branch : trunk
2010-08-10 19:15:50 +02:00
Shauren b29e64bd1f BuildSystem: Removed old, unused option
--HG--
branch : trunk
2010-08-10 15:25:50 +02:00
Shauren 58a219b4b6 BuildSystem/Windows: "compress" setting compiler flags into one statement
--HG--
branch : trunk
2010-08-09 23:54:22 +02:00
click 816acb11a4 BuilSystem: Clean up some small but annoying things from my earlier commits:
- return to using default CMake buildconfiguration (release, relwithdebinfo, debug, minsizerel
  Note: These are not yet populated as buildmodes : relwithdebinfo / minsizerel (will be created later)
- change it so that genrev creates revision.h properly (after genrev has been compiled successfully)
- split scripts/game PCH creation depending on which part a user wants to compile (default on) (thanks shauren)

--HG--
branch : trunk
2010-08-09 23:14:16 +02:00
click 4b5c9552cb BuildSystem/Windows: Add RelWithDebInfo configuration-type (reverts previous commit for fixups with RelWithDebInfo buildtype)
+ Stuff revision.h in under genrev project (yay, another project removed from projectlist)

--HG--
branch : trunk
2010-08-09 21:36:03 +02:00
Shauren 79dcd5859a BuildSystem/Windows: Force creating debug information in Release build if DEBUG is selected in cmake
--HG--
branch : trunk
2010-08-09 19:19:02 +02:00
click 6729518dbb Buildsytem/All: Clean up main CMakeLists.txt a tad bit
- Move genrevision subproject into own folder to avoid clutter (less junk)
- Make options a bit more understandable (for CMake GUI)
- Arrange CMakeLists.txt actions into subsections so it's easier to understand

--HG--
branch : trunk
2010-08-09 05:22:58 +02:00
click 31160bcfce Buildsystem/Windows: Minor adjustment to use the correct "environment"-variable in both VS2008 and VS2010
--HG--
branch : trunk
2010-08-08 19:11:57 +02:00
click 8a69e50d6a Buildsystem/Windows: Put all finished products (compiled executables and external DLLs) in BUILDDIR/bin/<builddtype>/
(Some cleanups will be done to this later, this is just POC for developers)

--HG--
branch : trunk
2010-08-08 18:34:35 +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 33829ed45e Clean up some crap - remove generated config.h (old junk) and also requirements for that in Error.h
--HG--
branch : trunk
2010-08-03 22:51:27 +02:00
click 60b119e0ca Buildsystem/CMake: Revert changes from r0fa0512527 and use the proper checks (fix logic-error in buildfile)
--HG--
branch : trunk
2010-07-31 05:36:05 +02:00
click c8d8e4cb6b Buildsystem/CMake : Adjust CMake policy to allow reusing logical targetnames
Closes issue 3167

--HG--
branch : trunk
2010-07-31 04:08:25 +02:00
click f213f2c7d9 Buildsystem/CMake: Include core/script headerfiles in generated MSVC-projects.
- Still "work in progress", as in missing filters and MSVC folder layouts.
- external libraries not fully "headerified" (not really required)

--HG--
branch : trunk
2010-07-29 21:08:16 +02:00
click bfc6dec072 Cut away DO_*-parts from buildsystem and specific files checking for it.
--HG--
branch : trunk
2010-07-27 05:40:21 +02:00
click 1c97876bcd Remove defunct handling of RemoteAccess console on/off (it's handled in config)
--HG--
branch : trunk
2010-07-23 08:09:50 +02:00
click 6d5da7a505 Cut down the number of compile-configurationss on CMake (Release and Debug)
--HG--
branch : trunk
2010-07-01 00:59:48 +02:00
click a9cae00503 Remove double-created genrev-target and move the CMAKE_BUILD_TYPE-declaration out of that section (not needed there)
--HG--
branch : trunk
2010-06-30 17:02:19 +02:00
click f8bb7afa98 And even more CMake-specific cleanups (mutes most of the "non-harmful" warnings - VS is just trying to be too friendly/noisy at times)
--HG--
branch : trunk
2010-06-30 16:51:37 +02:00
click fc1ed4b109 Make CMake-based building on Windows a little bit more silent + allow it to use more than 2GB memory on 32-bit platforms (shady solution)
--HG--
branch : trunk
2010-06-30 15:08:32 +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 06cd5563b6 Use the correct CMake-variable for where to place the generated revision.h file (whops)
--HG--
branch : trunk
2010-06-25 19:13:14 +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
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 d226e92ebb Fix linux compileissues when compiling with scripts - I actually forgot to reinstate it when cleaning up the CMakeLists.txt earlier. Sorry!
--HG--
branch : trunk
2010-06-14 11:27:44 +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
Brian e7083e46ac * Fixed typo
* Thanks Keven85

--HG--
branch : trunk
2010-06-13 13:34:04 -06:00
click 5c8ccefef5 Remove duplicate DO_WARN conditional in toplevel CMakeLists.txt (thanks to imbecile for spotting)
--HG--
branch : trunk
2010-06-13 17:36:05 +02:00
click 34617d0965 Correction on scripts config-entry in CMakeLists.txt + some generic cleanup on the output
+ set proper cmake-tagging when building in release- or debug-mode

--HG--
branch : trunk
2010-06-13 00:15:23 +02:00
Tartalo 2457c5a174 Add copyright notes to CMake files
--HG--
branch : trunk
2010-06-09 15:39:34 +02:00
Tartalo 5effc26ad3 Implement DO_WORLDSERVER and DO_AUTHSERVER options for cmake, both enabled by default
Needs more work to split shared/ and so on but it works

--HG--
branch : trunk
2010-06-09 14:15:57 +02:00
Brian 02efe02b43 * Added missing include paths that got lost in the merge a few revs ago
* Fixed realative path to Reference.h
* Re-enabled PCH building by default
* Re-enabled scripts building by default
* Linux compile now fully functional again.

--HG--
branch : trunk
2010-06-09 00:34:22 -06:00
click 2238007e4e Add libmpq-0.4.2 (was missing from sourcetree after cleanup)
--HG--
branch : trunk
2010-06-08 19:29:54 +02:00
click 332b0f3c8e Properly build and link core (yay!)
- Not done yet : Sorting out the PCH-system on *nix
- Not done yet : Sorting out scriptcompilation (still broken)

--HG--
branch : trunk
2010-06-08 08:59:38 +02:00
click f867f6d7a8 Get g3dlib, zlib and jemalloc to build again
--HG--
branch : trunk
rename : opt/cleanup/tab2spaces.sh => contrib/cleanup/tab2spaces.sh
rename : opt/cleanup/whitespace.sh => contrib/cleanup/whitespace.sh
rename : opt/conf_merge/README => contrib/conf_merge/README
rename : opt/conf_merge/index.php => contrib/conf_merge/index.php
rename : opt/conf_merge/merge.php => contrib/conf_merge/merge.php
rename : doc/AuctionHouseBot.txt => docs/AuctionHouseBot.txt
rename : doc/DocStructure.dox => docs/DocStructure.dox
rename : doc/Doxyfile.in => docs/Doxyfile.in
rename : doc/EventAI.txt => docs/EventAI.txt
rename : doc/HowToScript.txt => docs/HowToScript.txt
rename : doc/TextTables.txt => docs/TextTables.txt
rename : doc/UnixInstall.txt => docs/UnixInstall.txt
rename : externals/jemalloc/include/internal/arena.h => externals/jemalloc/jemalloc/internal/arena.h
rename : externals/jemalloc/include/internal/base.h => externals/jemalloc/jemalloc/internal/base.h
rename : externals/jemalloc/include/internal/chunk.h => externals/jemalloc/jemalloc/internal/chunk.h
rename : externals/jemalloc/include/internal/chunk_dss.h => externals/jemalloc/jemalloc/internal/chunk_dss.h
rename : externals/jemalloc/include/internal/chunk_mmap.h => externals/jemalloc/jemalloc/internal/chunk_mmap.h
rename : externals/jemalloc/include/internal/chunk_swap.h => externals/jemalloc/jemalloc/internal/chunk_swap.h
rename : externals/jemalloc/include/internal/ckh.h => externals/jemalloc/jemalloc/internal/ckh.h
rename : externals/jemalloc/include/internal/ctl.h => externals/jemalloc/jemalloc/internal/ctl.h
rename : externals/jemalloc/include/internal/extent.h => externals/jemalloc/jemalloc/internal/extent.h
rename : externals/jemalloc/include/internal/hash.h => externals/jemalloc/jemalloc/internal/hash.h
rename : externals/jemalloc/include/internal/huge.h => externals/jemalloc/jemalloc/internal/huge.h
rename : externals/jemalloc/include/internal/jemalloc_internal.h => externals/jemalloc/jemalloc/internal/jemalloc_internal.h
rename : externals/jemalloc/include/internal/jemalloc_internal.h.in => externals/jemalloc/jemalloc/internal/jemalloc_internal.h.in
rename : externals/jemalloc/include/internal/mb.h => externals/jemalloc/jemalloc/internal/mb.h
rename : externals/jemalloc/include/internal/mutex.h => externals/jemalloc/jemalloc/internal/mutex.h
rename : externals/jemalloc/include/internal/prof.h => externals/jemalloc/jemalloc/internal/prof.h
rename : externals/jemalloc/include/internal/ql.h => externals/jemalloc/jemalloc/internal/ql.h
rename : externals/jemalloc/include/internal/qr.h => externals/jemalloc/jemalloc/internal/qr.h
rename : externals/jemalloc/include/internal/rb.h => externals/jemalloc/jemalloc/internal/rb.h
rename : externals/jemalloc/include/internal/stats.h => externals/jemalloc/jemalloc/internal/stats.h
rename : externals/jemalloc/include/internal/tcache.h => externals/jemalloc/jemalloc/internal/tcache.h
rename : externals/jemalloc/include/internal/totally_not_p_r_n.h => externals/jemalloc/jemalloc/internal/totally_not_p_r_n.h
rename : externals/jemalloc/include/jemalloc.h => externals/jemalloc/jemalloc/jemalloc.h
rename : externals/jemalloc/include/jemalloc.h.in => externals/jemalloc/jemalloc/jemalloc.h.in
rename : externals/jemalloc/include/jemalloc_defs.h => externals/jemalloc/jemalloc/jemalloc_defs.h
rename : externals/jemalloc/include/jemalloc_defs.h.in => externals/jemalloc/jemalloc/jemalloc_defs.h.in
2010-06-08 08:04:26 +02:00
Tartalo a54624fa39 Add some messages to main cmake file
--HG--
branch : trunk
2010-06-07 21:58:26 +02:00
Brian 1a3f840a17 * broken
--HG--
branch : trunk
2010-06-07 13:20:46 -06:00
Tartalo e548d60b4e Initial DO_TOOLS support for cmake
--HG--
branch : trunk
2010-06-06 23:53:50 +02:00
Tartalo e4513dd0cb And even more CMakeLists.txt fixes (not finished yet)
--HG--
branch : trunk
2010-06-06 14:08:07 +02:00
Tartalo a9681e479d More CMakeLists.txt fixes. Repo is compilable but it may contain some errors yet
--HG--
branch : trunk
2010-06-06 12:51:59 +02:00
click eed0d341d2 Rewrite the warning (and thus add more hand-holding) regarding the "insourcetree build warning" when attempting a build directly in sourcetree.
Adds additional information on how to actually "unlock" the sourcetree again after an attempt to build in the sourcetree has been made.

--HG--
branch : trunk
2010-05-18 04:28:13 +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
raczman 20b79fec28 Don't build jemalloc on mac.
--HG--
branch : trunk
2010-04-24 14:20:28 +02:00
runningnak3d 873f8d0380 * New -DDO_SQL swich for cmake by default disabled to avoid usual not
* needed copy SQL files on linux environments
* Patch by Aokromes

--HG--
branch : trunk
2010-04-13 16:11:04 +02:00
raczman e30e9a45cb Cleaned up include directories in cmakes.
--HG--
branch : trunk
2010-04-06 15:53:27 +02:00