CHANGED: #238 Moved the config parsers into their own project.

cmake/CMakeLists.txt

@@ -112,6 +112,7 @@ set(PCRE_INCLUDE_DIRS "" CACHE INTERNAL "PCRE include dirs.")
 mark_as_advanced(ZLIB_LIBRARIES PCRE_LIBRARIES PCRE_INCLUDE_DIRS)
 
 set(GLOBAL_INCLUDE_DIRS 
+${ROOT_PATH}/src/config
 ${ROOT_PATH}/src/arcemu-shared
 ${ROOT_PATH}/src/arcemu-world
 ${ROOT_PATH}/src/arcemu-logonserver
@@ -158,15 +159,15 @@ if(WIN32)
 		else()
 			SET( EXTRA_LIBS ${EXTRA_LIBS} libmysql_release_x64.lib )
 		endif()
-		SET( EXTRA_LIBS ${EXTRA_LIBS} libxml2_win64.lib )
+		SET( LIBXML2_LIBRARIES libxml2_win64.lib)
 	else(IS_64BIT )
 		SET( EXTRA_LIBS libeay32_win32.lib )
 		if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 			SET(EXTRA_LIBS ${EXTRA_LIBS} libmysql_debug_win32.lib )
 		else()
 			SET( EXTRA_LIBS ${EXTRA_LIBS} libmysql_release_win32.lib )
 		endif()
-		SET( EXTRA_LIBS ${EXTRA_LIBS} libxml2_win32.lib )
+		SET( LIBXML2_LIBRARIES libxml2_win32.lib)
 	endif()
 	#Needed for socket stuff and crash handler
 	SET(EXTRA_LIBS ${EXTRA_LIBS} ws2_32.lib dbghelp.lib )
@@ -201,6 +202,7 @@ add_subdirectory(g3dlite)
 add_subdirectory(vmaplib)
 add_subdirectory(recast)
 add_subdirectory(detour)
+add_subdirectory(config)
 add_subdirectory(shared)
 add_subdirectory(logon)
 add_subdirectory(world)

cmake/config/CMakeLists.txt

@@ -0,0 +1,10 @@
+PROJECT( config )
+SET( PREFIX ${ROOT_PATH}/src/config )
+FILE( GLOB SRC ${PREFIX}/*.cpp )
+FILE( GLOB HDR ${PREFIX}/*.h )
+SET( SRCS ${SRC} )
+SET( HEADERS ${HDR} )
+include_directories( ${GLOBAL_INCLUDE_DIRS} )
+link_directories( ${DEPENDENCY_LIBS}  )
+add_library( ${PROJECT_NAME} ${SRCS} )
+target_link_libraries( ${PROJECT_NAME} ${LIBXML2_LIBRARIES} )

cmake/logon/CMakeLists.txt

@@ -5,7 +5,6 @@ SET( sources
   AuthSocket.cpp
   AutoPatcher.cpp
   LogonCommServer.cpp
-  LogonConfigParser.cpp
   LogonConsole.cpp
   LogonOpcodes.cpp
   LogonStdAfx.cpp
@@ -17,8 +16,6 @@ SET( sources
 	AuthStructs.h
 	AutoPatcher.h
 	LogonCommServer.h
-	LogonConfig.h
-	LogonConfigParser.h
 	LogonConsole.h
 	LogonOpcodes.h
 	LogonStdAfx.h
@@ -47,7 +44,7 @@ IF( CMAKE_GENERATOR MATCHES Visual*)
 	ADD_NATIVE_PRECOMPILED_HEADER(${PROJECT_NAME} LogonStdAfx.h ${prefix}/LogonStdAfx.cpp)
 ENDIF()
 #Link our shared lib.
-target_link_libraries( ${PROJECT_NAME} shared ${ZLIB_LIBRARIES} ${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES} )
+target_link_libraries( ${PROJECT_NAME} shared config ${ZLIB_LIBRARIES} ${PCRE_LIBRARIES} )
 #Provide make install rules.
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION .)
 

cmake/world/CMakeLists.txt

@@ -77,7 +77,6 @@ SET(sources
 	Object.cpp 
 	ObjectMgr.cpp 
 	Opcodes.cpp
-	OptionalConfigParser.cpp
 	Pet.cpp 
 	PetHandler.cpp 
 	Player.cpp 
@@ -88,7 +87,6 @@ SET(sources
 	QuestMgr.cpp 
 	QuestCommands.cpp 
 	RaidHandler.cpp 
-	RealmsConfigParser.cpp
 	RecallCommands.cpp 
 	ReputationHandler.cpp 
 	ScriptMgr.cpp 
@@ -114,7 +112,6 @@ SET(sources
 	WayPoints.cpp 
 	WeatherMgr.cpp 
 	World.cpp 
-	WorldConfigParser.cpp
 	WorldCreator.cpp 
 	WorldSession.cpp 
 	WorldSocket.cpp 
@@ -228,8 +225,6 @@ SET( headers
 	ObjectMgr.h
 	ObjectStorage.h
 	Opcodes.h
-	OptionalConfig.h
-	OptionalConfigParser.h
 	Paladin.h
 	Pet.h
 	Player.h
@@ -238,8 +233,6 @@ SET( headers
 	Priest.h
 	Quest.h
 	QuestMgr.h
-	RealmsConfig.h
-	RealmsConfigParser.h
 	Rogue.h
 	ScriptMgr.h
 	ScriptSetup.h
@@ -272,8 +265,6 @@ SET( headers
 	Entities/Summons/WildSummon.h
 	WordFilter.h
 	World.h
-	WorldConfig.h
-	WorldConfigParser.h
 	WorldCreator.h
 	WorldRunnable.h
 	WorldSession.h
@@ -303,7 +294,7 @@ ENDIF()
 set_target_properties(${PROJECT_NAME} PROPERTIES ENABLE_EXPORTS TRUE)
 
 add_dependencies( ${PROJECT_NAME} shared g3dlite vmaplib detour recast)
-target_link_libraries( ${PROJECT_NAME} shared  g3dlite vmaplib detour recast ${PCRE_LIBRARIES} ${LIBXML2_LIBRARIES} )
+target_link_libraries( ${PROJECT_NAME} shared  g3dlite vmaplib detour recast config ${PCRE_LIBRARIES} )
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION .)