Commit Graph

25 Commits

Author SHA1 Message Date
click
113d05b9d5 Buildsystem/Windows: Adjust includepaths slightly for extractortools to work properly with VC9
--HG--
branch : trunk
2010-08-11 22:08:12 +02:00
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
1f80c7b3c0 Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly
--HG--
branch : trunk
2010-08-08 19:45:53 +02:00
click
ce435f6d4f BuildSystem/VS: Remove now defunct an unmaintained buildfiles - use CMake for generating solutionfiles
--HG--
branch : trunk
2010-08-07 19:01:57 +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
Xanadu
79622802f3 Merge. Revision history for source files should be all back now.
--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
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-07-20 02:49:28 +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
Xanadu
711c12a68e Fixed win tool build.
--HG--
branch : trunk
2010-06-25 16:23:14 +02:00
click
7bf807aee4 Kill off the issues with the map/dbcextractors - and a thanks to imbecile@lavabit for the comment about loadlib.h
Just now the intent was to get it sorted out, as we might merge the tools into one "datatool" for all of this stuff.

--HG--
branch : trunk
rename : src/tools/map_extractor/loadlib/adt.cpp => src/tools/map_extractor/adt.cpp
rename : src/tools/map_extractor/loadlib/adt.h => src/tools/map_extractor/adt.h
rename : src/tools/map_extractor/loadlib/loadlib.cpp => src/tools/map_extractor/loadlib.cpp
rename : src/tools/map_extractor/loadlib/wdt.cpp => src/tools/map_extractor/wdt.cpp
rename : src/tools/map_extractor/loadlib/wdt.h => src/tools/map_extractor/wdt.h
2010-06-23 10:16:40 +02:00
Xanadu
ffaffe3fd7 * Renamed several VS projects and the executables they produce to reflect the new naming convention.
* Cleaned up some useless and redundant preprocessor definitions.
* Fixed the win build so that it correctly uses the mysql lib it built from the sources.
* Note that you still need to use 8615_mysql_openssl_libs.zip for the OpenSSL binaries.
* Also note that Win x64 build from the existing VS files is still fubar (mysql lib...).

--HG--
branch : trunk
2010-06-23 01:47:41 +02:00
Brian
c3b7ce7b69 * Commented useless error message in the map extractor
--HG--
branch : trunk
2010-06-22 17:07:27 -06:00
click
1c96f52568 Add more CMake-related support for building g3dlib, zlib, bzip2, ace on Windows
--HG--
branch : trunk
2010-06-21 07:17:26 +02:00
Xanadu
ec63820f56 * Fixed extraction tools windows compile and core windows compile for 32-bit targets. This should do until sufficiently good project files can be generated using cmake.
* Windows users need to download 8615_mysql_openssl_libs.zip from the project download page and unpack it to /externals.

--HG--
branch : trunk
2010-06-16 06:36:35 +02:00
Shauren
6520261ea6 Added _CRT_SECURE_NO_WARNINGS preprocessor definition to windows project files to reduce warning spam
Removed duplicate project file for map extractor

--HG--
branch : trunk
2010-06-13 13:05:25 +02:00
click
057ea32adf Fix issues with missing the printf()-function on newer distributions (thanks to svannon and brian for helping)
--HG--
branch : trunk
2010-06-12 00:45:24 +02:00
click
ccbff7a194 Remove README for the mapextractor, it's not used!
--HG--
branch : trunk
2010-06-11 23:14:14 +02:00
Shauren
4d84a4e82e Fixed libmpq build on windows
Added 1 solution for map extractor, vmap extractor and vmap assembler
Fixed debug build of map extractor (windows), don't forget to compile dependencies (external - bzip, libmpq and zlib)

--HG--
branch : trunk
2010-06-11 12:25:49 +02:00
click
39e793b2bd Add extractors and assembler - EXTRACTION OF NEW MAPS IS REQUIRED!
This will allow for easier testing of functionality between different
projects, ie. one set of maps/vmaps instead of 2 (saves space, saves
time and saves us some confusion).

--HG--
branch : trunk
2010-06-11 05:01:30 +02:00
Tartalo
bddfebb0c7 add -v version option to map_extractor
--HG--
branch : trunk
2010-06-09 17:20:06 +02:00
Tartalo
cc4413f6b4 Change binary names for tools/
--HG--
branch : trunk
2010-06-09 15:02:30 +02:00
Tartalo
f5d44784e1 Fix some typos and remove parent merged cmake file
--HG--
branch : trunk
2010-06-08 21:40:27 +02:00
Tartalo
220d4fa29c More fixes for tools/ cmake files
--HG--
branch : trunk
2010-06-08 21:11:07 +02:00
Tartalo
ec580c8f68 Some fixes for map_extractor cmake file
--HG--
branch : trunk
2010-06-08 19:28:52 +02:00
click
6a9357b13d Move contrib/libmpq into dep as an external dependency + remove extra libmpq-source found in map-extractor
--HG--
branch : trunk
rename : contrib/libmpq/AUTHORS => dep/libmpq/AUTHORS
rename : contrib/libmpq/COPYING => dep/libmpq/COPYING
rename : contrib/libmpq/FAQ => dep/libmpq/FAQ
rename : contrib/libmpq/Makefile.am => dep/libmpq/Makefile.am
rename : contrib/libmpq/NEWS => dep/libmpq/NEWS
rename : contrib/libmpq/README => dep/libmpq/README
rename : contrib/libmpq/THANKS => dep/libmpq/THANKS
rename : contrib/libmpq/TODO => dep/libmpq/TODO
rename : contrib/libmpq/autogen.sh => dep/libmpq/autogen.sh
rename : contrib/libmpq/bindings/Makefile.am => dep/libmpq/bindings/Makefile.am
rename : contrib/libmpq/bindings/d/Makefile.am => dep/libmpq/bindings/d/Makefile.am
rename : contrib/libmpq/bindings/d/dsss.conf => dep/libmpq/bindings/d/dsss.conf
rename : contrib/libmpq/bindings/d/mpq.d => dep/libmpq/bindings/d/mpq.d
rename : contrib/libmpq/bindings/python/Makefile.am => dep/libmpq/bindings/python/Makefile.am
rename : contrib/libmpq/bindings/python/mpq-info => dep/libmpq/bindings/python/mpq-info
rename : contrib/libmpq/bindings/python/mpq.py => dep/libmpq/bindings/python/mpq.py
rename : contrib/libmpq/configure.ac => dep/libmpq/configure.ac
rename : contrib/libmpq/debian/changelog => dep/libmpq/debian/changelog
rename : contrib/libmpq/debian/compat => dep/libmpq/debian/compat
rename : contrib/libmpq/debian/control => dep/libmpq/debian/control
rename : contrib/libmpq/debian/copyright => dep/libmpq/debian/copyright
rename : contrib/libmpq/debian/libmpq-dev.dirs => dep/libmpq/debian/libmpq-dev.dirs
rename : contrib/libmpq/debian/libmpq-dev.install => dep/libmpq/debian/libmpq-dev.install
rename : contrib/libmpq/debian/libmpq0.dirs => dep/libmpq/debian/libmpq0.dirs
rename : contrib/libmpq/debian/libmpq0.docs => dep/libmpq/debian/libmpq0.docs
rename : contrib/libmpq/debian/libmpq0.install => dep/libmpq/debian/libmpq0.install
rename : contrib/libmpq/debian/python-mpq.install => dep/libmpq/debian/python-mpq.install
rename : contrib/libmpq/debian/rules => dep/libmpq/debian/rules
rename : contrib/libmpq/doc/Makefile.am => dep/libmpq/doc/Makefile.am
rename : contrib/libmpq/doc/man1/Makefile.am => dep/libmpq/doc/man1/Makefile.am
rename : contrib/libmpq/doc/man1/libmpq-config.1 => dep/libmpq/doc/man1/libmpq-config.1
rename : contrib/libmpq/doc/man3/Makefile.am => dep/libmpq/doc/man3/Makefile.am
rename : contrib/libmpq/doc/man3/libmpq.3 => dep/libmpq/doc/man3/libmpq.3
rename : contrib/libmpq/doc/man3/libmpq__archive_close.3 => dep/libmpq/doc/man3/libmpq__archive_close.3
rename : contrib/libmpq/doc/man3/libmpq__archive_files.3 => dep/libmpq/doc/man3/libmpq__archive_files.3
rename : contrib/libmpq/doc/man3/libmpq__archive_offset.3 => dep/libmpq/doc/man3/libmpq__archive_offset.3
rename : contrib/libmpq/doc/man3/libmpq__archive_open.3 => dep/libmpq/doc/man3/libmpq__archive_open.3
rename : contrib/libmpq/doc/man3/libmpq__archive_packed_size.3 => dep/libmpq/doc/man3/libmpq__archive_packed_size.3
rename : contrib/libmpq/doc/man3/libmpq__archive_unpacked_size.3 => dep/libmpq/doc/man3/libmpq__archive_unpacked_size.3
rename : contrib/libmpq/doc/man3/libmpq__archive_version.3 => dep/libmpq/doc/man3/libmpq__archive_version.3
rename : contrib/libmpq/doc/man3/libmpq__block_close_offset.3 => dep/libmpq/doc/man3/libmpq__block_close_offset.3
rename : contrib/libmpq/doc/man3/libmpq__block_open_offset.3 => dep/libmpq/doc/man3/libmpq__block_open_offset.3
rename : contrib/libmpq/doc/man3/libmpq__block_read.3 => dep/libmpq/doc/man3/libmpq__block_read.3
rename : contrib/libmpq/doc/man3/libmpq__block_unpacked_size.3 => dep/libmpq/doc/man3/libmpq__block_unpacked_size.3
rename : contrib/libmpq/doc/man3/libmpq__file_blocks.3 => dep/libmpq/doc/man3/libmpq__file_blocks.3
rename : contrib/libmpq/doc/man3/libmpq__file_compressed.3 => dep/libmpq/doc/man3/libmpq__file_compressed.3
rename : contrib/libmpq/doc/man3/libmpq__file_encrypted.3 => dep/libmpq/doc/man3/libmpq__file_encrypted.3
rename : contrib/libmpq/doc/man3/libmpq__file_imploded.3 => dep/libmpq/doc/man3/libmpq__file_imploded.3
rename : contrib/libmpq/doc/man3/libmpq__file_number.3 => dep/libmpq/doc/man3/libmpq__file_number.3
rename : contrib/libmpq/doc/man3/libmpq__file_offset.3 => dep/libmpq/doc/man3/libmpq__file_offset.3
rename : contrib/libmpq/doc/man3/libmpq__file_packed_size.3 => dep/libmpq/doc/man3/libmpq__file_packed_size.3
rename : contrib/libmpq/doc/man3/libmpq__file_read.3 => dep/libmpq/doc/man3/libmpq__file_read.3
rename : contrib/libmpq/doc/man3/libmpq__file_unpacked_size.3 => dep/libmpq/doc/man3/libmpq__file_unpacked_size.3
rename : contrib/libmpq/doc/man3/libmpq__version.3 => dep/libmpq/doc/man3/libmpq__version.3
rename : contrib/libmpq/libmpq-config.in => dep/libmpq/libmpq-config.in
rename : contrib/libmpq/libmpq.pc.in => dep/libmpq/libmpq.pc.in
rename : contrib/libmpq/libmpq/Makefile.am => dep/libmpq/libmpq/Makefile.am
rename : contrib/libmpq/libmpq/common.c => dep/libmpq/libmpq/common.c
rename : contrib/libmpq/libmpq/common.h => dep/libmpq/libmpq/common.h
rename : contrib/libmpq/libmpq/crypt_buf.h => dep/libmpq/libmpq/crypt_buf.h
rename : contrib/libmpq/libmpq/explode.c => dep/libmpq/libmpq/explode.c
rename : contrib/libmpq/libmpq/explode.h => dep/libmpq/libmpq/explode.h
rename : contrib/libmpq/libmpq/extract.c => dep/libmpq/libmpq/extract.c
rename : contrib/libmpq/libmpq/extract.h => dep/libmpq/libmpq/extract.h
rename : contrib/libmpq/libmpq/huffman.c => dep/libmpq/libmpq/huffman.c
rename : contrib/libmpq/libmpq/huffman.h => dep/libmpq/libmpq/huffman.h
rename : contrib/libmpq/libmpq/mpq-internal.h => dep/libmpq/libmpq/mpq-internal.h
rename : contrib/libmpq/libmpq/mpq.c => dep/libmpq/libmpq/mpq.c
rename : contrib/libmpq/libmpq/mpq.h => dep/libmpq/libmpq/mpq.h
rename : contrib/libmpq/libmpq/wave.c => dep/libmpq/libmpq/wave.c
rename : contrib/libmpq/libmpq/wave.h => dep/libmpq/libmpq/wave.h
rename : contrib/libmpq/tools/Makefile.am => dep/libmpq/tools/Makefile.am
rename : contrib/libmpq/tools/crypt_buf_gen.c => dep/libmpq/tools/crypt_buf_gen.c
rename : contrib/libmpq/win/VS100/libmpq.vcxproj => dep/libmpq/win/VS100/libmpq.vcxproj
rename : contrib/libmpq/win/config.h => dep/libmpq/win/config.h
rename : contrib/libmpq/win/libmpq_VC90.sln => dep/libmpq/win/libmpq_VC90.sln
rename : contrib/libmpq/win/stdint.h => dep/libmpq/win/stdint.h
2010-06-05 23:00:30 +02:00
click
09970c3c72 Move extractors/assemblers and the revisiongenerator around to accomodate upcoming new treestructure
--HG--
branch : trunk
rename : src/tools/genrevision/genrevision.cpp => src/genrevision/genrevision.cpp
rename : contrib/map_extractor/CMakeLists.txt => src/tools/map_extractor/CMakeLists.txt
rename : contrib/map_extractor/README.linux => src/tools/map_extractor/README.linux
rename : contrib/map_extractor/System.cpp => src/tools/map_extractor/System.cpp
rename : contrib/map_extractor/VC90_AD.sln => src/tools/map_extractor/VC90_AD.sln
rename : contrib/map_extractor/VC90_ad.vcproj => src/tools/map_extractor/VC90_ad.vcproj
rename : contrib/map_extractor/ad => src/tools/map_extractor/ad
rename : contrib/map_extractor/ad.exe => src/tools/map_extractor/ad.exe
rename : contrib/map_extractor/adt.cpp => src/tools/map_extractor/adt.cpp
rename : contrib/map_extractor/adt.h => src/tools/map_extractor/adt.h
rename : contrib/map_extractor/dbcfile.cpp => src/tools/map_extractor/dbcfile.cpp
rename : contrib/map_extractor/dbcfile.h => src/tools/map_extractor/dbcfile.h
rename : contrib/map_extractor/debug/zlib.lib => src/tools/map_extractor/debug/zlib.lib
rename : contrib/map_extractor/libmpq/CMakeLists.txt => src/tools/map_extractor/libmpq/CMakeLists.txt
rename : contrib/map_extractor/libmpq/common.cpp => src/tools/map_extractor/libmpq/common.cpp
rename : contrib/map_extractor/libmpq/common.h => src/tools/map_extractor/libmpq/common.h
rename : contrib/map_extractor/libmpq/explode.cpp => src/tools/map_extractor/libmpq/explode.cpp
rename : contrib/map_extractor/libmpq/explode.h => src/tools/map_extractor/libmpq/explode.h
rename : contrib/map_extractor/libmpq/extract.cpp => src/tools/map_extractor/libmpq/extract.cpp
rename : contrib/map_extractor/libmpq/huffman.cpp => src/tools/map_extractor/libmpq/huffman.cpp
rename : contrib/map_extractor/libmpq/huffman.h => src/tools/map_extractor/libmpq/huffman.h
rename : contrib/map_extractor/libmpq/mpq.cpp => src/tools/map_extractor/libmpq/mpq.cpp
rename : contrib/map_extractor/libmpq/mpq.h => src/tools/map_extractor/libmpq/mpq.h
rename : contrib/map_extractor/libmpq/parser.cpp => src/tools/map_extractor/libmpq/parser.cpp
rename : contrib/map_extractor/libmpq/wave.cpp => src/tools/map_extractor/libmpq/wave.cpp
rename : contrib/map_extractor/libmpq/wave.h => src/tools/map_extractor/libmpq/wave.h
rename : contrib/map_extractor/libmpq/zconf.h => src/tools/map_extractor/libmpq/zconf.h
rename : contrib/map_extractor/libmpq/zlib.h => src/tools/map_extractor/libmpq/zlib.h
rename : contrib/map_extractor/loadlib/CMakeLists.txt => src/tools/map_extractor/loadlib/CMakeLists.txt
rename : contrib/map_extractor/loadlib/adt.cpp => src/tools/map_extractor/loadlib/adt.cpp
rename : contrib/map_extractor/loadlib/adt.h => src/tools/map_extractor/loadlib/adt.h
rename : contrib/map_extractor/loadlib/loadlib.cpp => src/tools/map_extractor/loadlib/loadlib.cpp
rename : contrib/map_extractor/loadlib/loadlib.h => src/tools/map_extractor/loadlib/loadlib.h
rename : contrib/map_extractor/loadlib/wdt.cpp => src/tools/map_extractor/loadlib/wdt.cpp
rename : contrib/map_extractor/loadlib/wdt.h => src/tools/map_extractor/loadlib/wdt.h
rename : contrib/map_extractor/mpq_libmpq.cpp => src/tools/map_extractor/mpq_libmpq.cpp
rename : contrib/map_extractor/mpq_libmpq.h => src/tools/map_extractor/mpq_libmpq.h
rename : contrib/map_extractor/release/zlib.lib => src/tools/map_extractor/release/zlib.lib
rename : contrib/vmap3_assembler/CMakeLists.txt => src/tools/vmap3_assembler/CMakeLists.txt
rename : contrib/vmap3_assembler/VC90/vmap_assembler.vcproj => src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
rename : contrib/vmap3_assembler/splitConfig.txt => src/tools/vmap3_assembler/splitConfig.txt
rename : contrib/vmap3_assembler/vmap_assembler.cpp => src/tools/vmap3_assembler/vmap_assembler.cpp
rename : contrib/vmap3_assembler/vmap_assemblerVC90.sln => src/tools/vmap3_assembler/vmap_assemblerVC90.sln
rename : contrib/vmap3_extractor/CMakeLists.txt => src/tools/vmap3_extractor/CMakeLists.txt
rename : contrib/vmap3_extractor/vmapextract/CMakeLists.txt => src/tools/vmap3_extractor/vmapextract/CMakeLists.txt
rename : contrib/vmap3_extractor/vmapextract/adtfile.cpp => src/tools/vmap3_extractor/vmapextract/adtfile.cpp
rename : contrib/vmap3_extractor/vmapextract/adtfile.h => src/tools/vmap3_extractor/vmapextract/adtfile.h
rename : contrib/vmap3_extractor/vmapextract/dbcfile.cpp => src/tools/vmap3_extractor/vmapextract/dbcfile.cpp
rename : contrib/vmap3_extractor/vmapextract/dbcfile.h => src/tools/vmap3_extractor/vmapextract/dbcfile.h
rename : contrib/vmap3_extractor/vmapextract/loadlib/loadlib.h => src/tools/vmap3_extractor/vmapextract/loadlib/loadlib.h
rename : contrib/vmap3_extractor/vmapextract/model.cpp => src/tools/vmap3_extractor/vmapextract/model.cpp
rename : contrib/vmap3_extractor/vmapextract/model.h => src/tools/vmap3_extractor/vmapextract/model.h
rename : contrib/vmap3_extractor/vmapextract/modelheaders.h => src/tools/vmap3_extractor/vmapextract/modelheaders.h
rename : contrib/vmap3_extractor/vmapextract/mpq_libmpq.cpp => src/tools/vmap3_extractor/vmapextract/mpq_libmpq.cpp
rename : contrib/vmap3_extractor/vmapextract/mpq_libmpq04.h => src/tools/vmap3_extractor/vmapextract/mpq_libmpq04.h
rename : contrib/vmap3_extractor/vmapextract/vec3d.h => src/tools/vmap3_extractor/vmapextract/vec3d.h
rename : contrib/vmap3_extractor/vmapextract/vmapexport.cpp => src/tools/vmap3_extractor/vmapextract/vmapexport.cpp
rename : contrib/vmap3_extractor/vmapextract/vmapexport.h => src/tools/vmap3_extractor/vmapextract/vmapexport.h
rename : contrib/vmap3_extractor/vmapextract/wdtfile.cpp => src/tools/vmap3_extractor/vmapextract/wdtfile.cpp
rename : contrib/vmap3_extractor/vmapextract/wdtfile.h => src/tools/vmap3_extractor/vmapextract/wdtfile.h
rename : contrib/vmap3_extractor/vmapextract/wmo.cpp => src/tools/vmap3_extractor/vmapextract/wmo.cpp
rename : contrib/vmap3_extractor/vmapextract/wmo.h => src/tools/vmap3_extractor/vmapextract/wmo.h
rename : contrib/vmap3_extractor/win/vmapExtractor3_VC90.sln => src/tools/vmap3_extractor/win/vmapExtractor3_VC90.sln
2010-06-05 18:58:56 +02:00