mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[m] attempt to fix Travis not building

Browse source
This commit is contained in:
billy1arm 2013-06-17 13:01:53 +01:00 • committed by Antz
parent a05c31e62f
commit 42abf7c67e
9 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
contrib/extractor/CMakeLists.txt
View file

@ -8,7 +8,8 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.8)
project (MANGOS_MAP_EXTRACTOR) project (MANGOS_MAP_EXTRACTOR)
add_subdirectory (loadlib) add_subdirectory (loadlib)

4
contrib/mmap/CMakeLists.txt
View file

@ -8,7 +8,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.8)
project( MoveMapGen ) project( MoveMapGen )
@ -26,9 +26,9 @@ include_directories(
../../src/game ../../src/game
../../src/game/vmap ../../src/game/vmap
../../dep/include/g3dlite ../../dep/include/g3dlite
../../src/framework
../../dep/ACE_wrappers ../../dep/ACE_wrappers
../../objdir/dep/ACE_wrappers ../../objdir/dep/ACE_wrappers
../../src/framework
../../dep/recastnavigation/Detour/Include ../../dep/recastnavigation/Detour/Include
../../dep/recastnavigation/Recast/Include ../../dep/recastnavigation/Recast/Include
../../dep/src/zlib ../../dep/src/zlib

4
contrib/vmap_assembler/CMakeLists.txt
View file

@ -8,7 +8,8 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.8)
project (MANGOS_VMAP_ASSEMB_IO) project (MANGOS_VMAP_ASSEMB_IO)
set(CMAKE_VERBOSE_MAKEFILE true) set(CMAKE_VERBOSE_MAKEFILE true)
@ -85,4 +86,3 @@ target_link_libraries(vmap_assembler vmap)
# add_executable(vmap_test coordinate_test.cpp) # add_executable(vmap_test coordinate_test.cpp)
# target_link_libraries(vmap_test vmap) # target_link_libraries(vmap_test vmap)

2
contrib/vmap_assembler/VC100/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*.user
bin

2
contrib/vmap_assembler/VC110/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*.user
bin

6
contrib/vmap_extractor/CMakeLists.txt
View file

@ -8,9 +8,9 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.8)
project (MANGOS_VMAP_EXTRACT_IO)
project (MANGOS_VMAP_EXTRACT_IO)
# uncomment next line to disable debug mode # uncomment next line to disable debug mode
ADD_DEFINITIONS("-DIOMAP_DEBUG") ADD_DEFINITIONS("-DIOMAP_DEBUG")
@ -20,6 +20,6 @@ ADD_DEFINITIONS("-Wall")
ADD_DEFINITIONS("-ggdb") ADD_DEFINITIONS("-ggdb")
ADD_DEFINITIONS("-O3") ADD_DEFINITIONS("-O3")
include_directories(../../dep/libmpq) include_directories(${CMAKE_SOURCE_DIR}/../../dep/libmpq)
add_subdirectory(vmapextract) add_subdirectory(vmapextract)

6
contrib/vmap_extractor/README
View file

@ -9,7 +9,7 @@ Linux:
$ ./configure $ ./configure
$ make $ make
After that, cd to contrib/vmap_extractor_v4/ and execute: After that, cd to contrib/vmap_extractor/ and execute:
$ cmake . $ cmake .
$ make $ make
@ -30,8 +30,8 @@ Windows:
1. Building 1. Building
Just build the solution in contrib\vmap_extractor_v2\win Just build the solution in contrib\vmap_extractor\win
Resulting binaries will be in contrib\vmap_extractor_v2\bin\$(PlatformName)_$(ConfigurationName) Resulting binaries will be in contrib\vmap_extractor\bin\$(PlatformName)_$(ConfigurationName)
2. Extracting 2. Extracting

2
contrib/vmap_extractor/make_vmaps.bat
View file

@ -10,7 +10,7 @@ cls
echo. echo.
echo. echo.
echo. echo.
IF EXIST buildings\dir (ECHO The buildings folder already exist do you want to delete it? IF EXIST Buildings\dir (ECHO The Buildings folder already exist do you want to delete it?
echo If YES hit Enter to continue if no CLOSE the program now! . . . echo If YES hit Enter to continue if no CLOSE the program now! . . .
pause>nul pause>nul
DEL /S /Q buildings) DEL /S /Q buildings)

5
contrib/vmap_extractor/vmapextract/CMakeLists.txt
View file

@ -8,9 +8,10 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.8)
project (MANGOS_IOMAP_EXTRACTOR) project (MANGOS_IOMAP_EXTRACTOR)
LINK_DIRECTORIES( ${LINK_DIRECTORIES} ../../../dep/libmpq/libmpq/.libs/ ) LINK_DIRECTORIES( ${LINK_DIRECTORIES} ${CMAKE_SOURCE_DIR}/../../dep/libmpq/libmpq/.libs/ )
add_executable(vmapextractor adtfile.cpp dbcfile.cpp gameobject_extract.cpp model.cpp mpq_libmpq.cpp vmapexport.cpp wdtfile.cpp wmo.cpp) add_executable(vmapextractor adtfile.cpp dbcfile.cpp gameobject_extract.cpp model.cpp mpq_libmpq.cpp vmapexport.cpp wdtfile.cpp wmo.cpp)
target_link_libraries(vmapextractor libmpq.a bz2 z) target_link_libraries(vmapextractor libmpq.a bz2 z)