* broken

--HG--
branch : trunk

CMakeLists.txt

@@ -183,7 +183,6 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-add_subdirectory(dep)
 add_subdirectory(src)
 if(DO_SQL)
     message("* Copy SQL files ON")

src/server/game/Chat/Commands/Level1.cpp

@@ -20,21 +20,21 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
+#include "Packets/WorldPacket.h"
+#include "Server/WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "AccountMgr.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "Chat.h"
-#include "Log.h"
+#include "Logging/Log.h"
 #include "MapManager.h"
 #include "ObjectAccessor.h"
-#include "Language.h"
-#include "CellImpl.h"
+#include "Miscellaneous/Language.h"
+#include "Grids/Cells/CellImpl.h"
 #include "InstanceSaveMgr.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 #ifdef _DEBUG_VMAPS
 #include "VMapFactory.h"

src/server/shared/CMakeLists.txt

@@ -35,8 +35,9 @@ SET(shared_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/include
-  ${CMAKE_SOURCE_DIR}/dep/include/sockets
+  ${CMAKE_BINARY_DIR}/externals/SFMT
+  ${CMAKE_SOURCE_DIR}/externals/sockets/include
+  ${CMAKE_SOURCE_DIR}/externals/utf8cpp
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography

src/server/shared/Utilities/Util.cpp

@@ -20,9 +20,9 @@
 
 #include "Util.h"
 
-#include "sockets/socket_include.h"
-#include "utf8cpp/utf8.h"
-#include "mersennetwister/MersenneTwister.h"
+#include "socket_include.h"
+#include "utf8.h"
+#include "SFMT.h"
 #include <ace/TSS_T.h>
 
 typedef ACE_TSS<MTRand> MTRandTSS;