diff options
| -rw-r--r-- | dep/StormLib/CMakeLists.txt | 34 | ||||
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 2 |
2 files changed, 9 insertions, 27 deletions
diff --git a/dep/StormLib/CMakeLists.txt b/dep/StormLib/CMakeLists.txt index 33f5f7b830d..bc6f947af13 100644 --- a/dep/StormLib/CMakeLists.txt +++ b/dep/StormLib/CMakeLists.txt @@ -1,6 +1,3 @@ -project(StormLib) -cmake_minimum_required(VERSION 2.6) - set(SRC_FILES src/adpcm/adpcm.cpp src/huffman/huff.cpp @@ -239,26 +236,21 @@ set(TEST_SRC_FILES add_definitions(-D_7ZIP_ST -DBZ_STRICT_ANSI) -if(WIN32) - if(MSVC) - message(STATUS "Using MSVC") +if( WIN32 ) + if( MSVC ) add_definitions(-D_7ZIP_ST -DWIN32) - else() - message(STATUS "Using mingw") endif() set(SRC_ADDITIONAL_FILES ${ZLIB_BZIP2_FILES} ${TOMCRYPT_FILES} ${TOMMATH_FILES}) endif() -if(APPLE) - message(STATUS "Using Mac OS X port") +if( APPLE ) set(LINK_LIBS z bz2) set(SRC_ADDITIONAL_FILES ${TOMCRYPT_FILES} ${TOMMATH_FILES}) endif() -if (${CMAKE_SYSTEM_NAME} STREQUAL Linux) - message(STATUS "Using Linux port") +if( ${CMAKE_SYSTEM_NAME} STREQUAL Linux ) option(WITH_LIBTOMCRYPT "Use system LibTomCrypt library" OFF) - if(WITH_LIBTOMCRYPT) + if( WITH_LIBTOMCRYPT ) set(LINK_LIBS z bz2 tomcrypt) else() set(LINK_LIBS z bz2) @@ -269,27 +261,17 @@ endif() add_library(storm STATIC ${SRC_FILES} ${SRC_ADDITIONAL_FILES}) target_link_libraries(storm ${LINK_LIBS}) -option(WITH_TEST "Compile Test application" OFF) -if(WITH_TEST) - add_executable(storm_test ${TEST_SRC_FILES}) - target_link_libraries(storm_test storm) -endif() - -if(APPLE) +if( APPLE ) set_target_properties(storm PROPERTIES FRAMEWORK true) set_target_properties(storm PROPERTIES PUBLIC_HEADER "src/StormLib.h src/StormPort.h") set_target_properties(storm PROPERTIES LINK_FLAGS "-framework Carbon") endif() -if(UNIX) +if( UNIX ) set_target_properties(storm PROPERTIES SOVERSION 0) endif() # On Win32, build StormLib.dll since we don't want to clash with Storm.dll -if(WIN32) +if( WIN32 ) set_target_properties(storm PROPERTIES OUTPUT_NAME StormLib) endif() - -#install(TARGETS storm ARCHIVE DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib FRAMEWORK DESTINATION /Library/Frameworks) -#install(FILES src/StormLib.h src/StormPort.h DESTINATION include) - diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 241be4982ab..41941795b20 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -670,7 +670,7 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 { for(int j = 0; j < ADT_CELLS_PER_GRID; j++) { - adt_MCNK *cell = cells->getMCNK(i, j); + adt_MCNK *cell = adt.cells[i][j]; if (!cell) continue; |