diff --git a/CMakeLists.txt b/CMakeLists.txt index b99b1c316..2bb96e0b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,8 +114,6 @@ OPTION(EQEMU_BUILD_AZONE "Build azone utility." OFF) OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF) IF(UNIX) - #Whether to build cleanipc or not (probably a good idea if you build server) - OPTION(EQEMU_BUILD_CLEANIPC "Build cleanipc." ON) ADD_DEFINITIONS(-std=c++0x) ENDIF(UNIX) @@ -148,9 +146,9 @@ IF(EQEMU_BUILD_LOGIN) ADD_SUBDIRECTORY(loginserver) ENDIF(EQEMU_BUILD_LOGIN) -IF(EQEMU_BUILD_AZONE OR EQEMU_BUILD_CLEANIPC) +IF(EQEMU_BUILD_AZONE) ADD_SUBDIRECTORY(utils) -ENDIF(EQEMU_BUILD_AZONE OR EQEMU_BUILD_CLEANIPC) +ENDIF(EQEMU_BUILD_AZONE) IF(EQEMU_BUILD_TESTS) ADD_SUBDIRECTORY(tests) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 3e6d2ee1a..4aec544ee 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -4,19 +4,4 @@ IF(UNIX) ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) -IF(UNIX AND EQEMU_BUILD_CLEANIPC) - SET(cleanipc_sources - cleanipc.cpp - ) - - SET(cleanipc_headers - ) - - ADD_EXECUTABLE(cleanipc ${cleanipc_sources} ${cleanipc_headers}) - TARGET_LINK_LIBRARIES(cleanipc "rt") - SET(EXECUTABLE_OUTPUT_PATH ../Bin) -ENDIF(UNIX AND EQEMU_BUILD_CLEANIPC) - -IF(EQEMU_BUILD_AZONE) - ADD_SUBDIRECTORY(azone2) -ENDIF(EQEMU_BUILD_AZONE) \ No newline at end of file +ADD_SUBDIRECTORY(azone2) diff --git a/utils/cleanipc.cpp b/utils/cleanipc.cpp deleted file mode 100644 index b8681853f..000000000 --- a/utils/cleanipc.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include -#include -#include -#include - -#include - -int main(int argc, char** argv) { - using std::cout; - using std::endl; - - key_t shm_key; - shmid_ds* memuser_ds = new shmid_ds; - - bool print = false; - if (argc >= 2) { - print = true; - } - - for ( int i = 0; i < 10; i++) { - memuser_ds->shm_nattch = 0; - const char *n = "ERROR"; - switch (i) { - case 0: shm_key = ftok(".", 'I'); n="items"; break; - case 1: shm_key = ftok(".", 'N'); n="unused"/*npc_types*/; break; - case 2: shm_key = ftok(".", 'D'); n="unused"/*doors*/; break; - case 3: shm_key = ftok(".", 'S'); n="spells"; break; - case 4: shm_key = ftok(".", 'F'); n="factions"; break; - case 5: shm_key = ftok(".", 'L'); n="loot"; break; - case 6: shm_key = ftok(".", 'M'); n="unused"/*??*/; break; - case 7: shm_key = ftok(".", 'O'); n="opcodes"; break; - case 8: shm_key = ftok(".", 'Z'); n="unused"/*item serialization*/; break; - case 9: shm_key = ftok(".", 'K'); n="skillcaps"; break; - default: break; - } - int semid = semget(shm_key, 1, 0); - if(print){ - cout<<"ID="<shm_nattch > 0) { - cout << "Something is still attached to " << shm_key << " (" << n << ")" << endl; - } else { - cout << "Successfully removed " << shm_key << " (" << n << ")" << endl; - } - if(print){ - cout<<" useing_shm="; - cout<shm_nattch; - } - if (memuser_ds->shm_nattch == 0) { - if(print){ - cout<<" Deleteing stale shares"<