From 2ef6d3f93e35be28ae19d70643c3d3cda52fbaf0 Mon Sep 17 00:00:00 2001 From: KimLS Date: Mon, 30 Jun 2014 14:09:03 -0700 Subject: [PATCH] Removed older AZone build options, use eqemu-zone-utils instead --- CMakeLists.txt | 5 -- utils/CMakeLists.txt | 7 --- utils/azone2/CMakeLists.txt | 119 ------------------------------------ 3 files changed, 131 deletions(-) delete mode 100644 utils/CMakeLists.txt delete mode 100644 utils/azone2/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 45d3f6c50..4732ca8d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,7 +229,6 @@ ENDIF(EQEMU_ENABLE_BOTS) #What to build OPTION(EQEMU_BUILD_SERVER "Build the game server." ON) OPTION(EQEMU_BUILD_LOGIN "Build the login server." OFF) -OPTION(EQEMU_BUILD_AZONE "Build azone utility." OFF) OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF) OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON) OPTION(EQEMU_BUILD_LUA "Build Lua parser." OFF) @@ -319,10 +318,6 @@ IF(EQEMU_BUILD_LOGIN) ADD_SUBDIRECTORY(loginserver) ENDIF(EQEMU_BUILD_LOGIN) -IF(EQEMU_BUILD_AZONE) - ADD_SUBDIRECTORY(utils) -ENDIF(EQEMU_BUILD_AZONE) - IF(EQEMU_BUILD_TESTS) ADD_SUBDIRECTORY(tests) ENDIF(EQEMU_BUILD_TESTS) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt deleted file mode 100644 index 4aec544ee..000000000 --- a/utils/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) - -IF(UNIX) - ADD_DEFINITIONS(-fPIC) -ENDIF(UNIX) - -ADD_SUBDIRECTORY(azone2) diff --git a/utils/azone2/CMakeLists.txt b/utils/azone2/CMakeLists.txt deleted file mode 100644 index 3567df948..000000000 --- a/utils/azone2/CMakeLists.txt +++ /dev/null @@ -1,119 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) - -IF(NOT MSVC) - ADD_DEFINITIONS(-fpermissive) -ENDIF(NOT MSVC) - -#azone common -SET(azone_common_sources - dat.cpp - file.cpp - global.cpp - pfs.cpp - ter.cpp - wld.cpp - zon.cpp - zonv4.cpp -) - -SET(azone_common_headers - 3d.hpp - 3d_base.hpp - archive.hpp - dat.hpp - file.hpp - file_loader.hpp - global.hpp - octree.hpp - pfs.hpp - s3d.h - ter.hpp - types.h - wld.hpp - wld_structs.hpp - zon.hpp - zonv4.hpp -) - -ADD_LIBRARY(azone_common ${azone_common_sources} ${azone_common_headers}) -SET(LIBRARY_OUTPUT_PATH ../../Bin) - -#azone -SET(azone_sources - azone.cpp -) - -SET(azone_headers - azone.h -) - -ADD_EXECUTABLE(azone ${azone_sources} ${azone_headers}) -TARGET_LINK_LIBRARIES(azone azone_common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE}) -IF(MSVC) - SET_TARGET_PROPERTIES(azone PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(azone "Ws2_32.lib") -ENDIF(MSVC) - -IF(UNIX) - TARGET_LINK_LIBRARIES(azone "z") -ENDIF(UNIX) - -SET(EXECUTABLE_OUTPUT_PATH ../../Bin) - -#awater -SET(awater_sources - awater.cpp -) - -SET(awater_headers - awater.h -) - -ADD_EXECUTABLE(awater ${awater_sources} ${awater_headers}) -TARGET_LINK_LIBRARIES(awater azone_common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE}) -IF(MSVC) - SET_TARGET_PROPERTIES(awater PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(awater "Ws2_32.lib") -ENDIF(MSVC) - -IF(UNIX) - TARGET_LINK_LIBRARIES(awater "z") -ENDIF(UNIX) - -SET(EXECUTABLE_OUTPUT_PATH ../../Bin) - -#listobj -SET(listobj_sources - listobj.cpp -) - -SET(listobj_headers -) - -ADD_EXECUTABLE(listobj ${listobj_sources} ${listobj_headers}) -TARGET_LINK_LIBRARIES(listobj azone_common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE}) -IF(MSVC) - SET_TARGET_PROPERTIES(listobj PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(listobj "Ws2_32.lib") -ENDIF(MSVC) - -IF(UNIX) - TARGET_LINK_LIBRARIES(listobj "z") -ENDIF(UNIX) - -#on windows: glmodelviewer -IF(MSVC) - SET(glmodelviewer_sources - GLModelViewer.cpp - ) - - SET(glmodelviewer_headers - GLModelViewer.h - ) - - ADD_EXECUTABLE(glmodelviewer WIN32 ${glmodelviewer_sources} ${glmodelviewer_headers}) - TARGET_LINK_LIBRARIES(glmodelviewer azone_common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} "opengl32.lib" "GLU32.lib" "Ws2_32.lib") - SET_TARGET_PROPERTIES(glmodelviewer PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - - SET(EXECUTABLE_OUTPUT_PATH ../../Bin) -ENDIF(MSVC)