Changed: Snowballs projects updated

code/snowballs2/client/src/CMakeLists.txt

@@ -1,19 +1,21 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(snowballs ${SRC})
+ADD_EXECUTABLE(snowballs_client WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(snowballs ${PLATFORM_LINKFLAGS} ${PNG_LIBRARIES} ${LIBXML2_LIBRARIES} ${FREETYPE_LIBRARY} ${JPEG_LIBRARY} ${NELMISC_LIBRARY} ${NELPACS_LIBRARY} ${NELNET_LIBRARY} ${NEL3D_LIBRARY})
+TARGET_LINK_LIBRARIES(snowballs_client
+						${PLATFORM_LINKFLAGS}
+						nelmisc
+						nelpacs
+						nelnet
+						nel3d)
+
+NL_DEFAULT_PROPS(snowballs_client "Snowballs, Client: Snowballs Client")
+NL_ADD_RUNTIME_FLAGS(snowballs_client)
 
 # If sound is enabled then add the definitions and link the libraries.
 IF(ENABLE_SOUND)
   ADD_DEFINITIONS(-DSBCLIENT_WITH_SOUND)
-  TARGET_LINK_LIBRARIES(snowballs ${NELSOUND_LIBRARY} ${NELSNDDRV_LIBRARY})
+  TARGET_LINK_LIBRARIES(snowballs_client ${NELSOUND_LIBRARY})
 ENDIF(ENABLE_SOUND)
-IF(WIN32)
-  SET_TARGET_PROPERTIES(snowballs PROPERTIES 
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
-	PROJECT_LABEL "Snowballs Client")
-ENDIF(WIN32)
 
-INSTALL(TARGETS snowballs RUNTIME DESTINATION bin COMPONENT snowballsclient)
+INSTALL(TARGETS snowballs_client RUNTIME DESTINATION bin COMPONENT snowballsclient)

code/snowballs2/server/chat/src/CMakeLists.txt

@@ -1,14 +1,18 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(sno_chat ${SRC})
-
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(sno_chat ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY})
-IF(WIN32)
-  SET_TARGET_PROPERTIES(sno_chat PROPERTIES 
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
-	PROJECT_LABEL "Services: Snowballs Chat")
-ENDIF(WIN32)
+ADD_EXECUTABLE(snowballs_chat_service WIN32 ${SRC})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(snowballs_chat_service
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc
+						nelnet)
+
+NL_DEFAULT_PROPS(snowballs_chat_service "Snowballs, Services: Chat")
+NL_ADD_RUNTIME_FLAGS(snowballs_chat_service)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS sno_chat RUNTIME DESTINATION sbin COMPONENT services)
+INSTALL(TARGETS snowballs_chat_service RUNTIME DESTINATION sbin COMPONENT services)

code/snowballs2/server/collision/src/CMakeLists.txt

@@ -1,14 +1,20 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(sno_collision ${SRC})
-
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${PNG_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(sno_collision ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${PNG_LIBRARIES} ${FREETYPE_LIBRARY} ${JPEG_LIBRARY} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELPACS_LIBRARY} ${NEL3D_LIBRARY} ${FREETYPE_LIBRARY})
-IF(WIN32)
-  SET_TARGET_PROPERTIES(sno_collision PROPERTIES 
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
-	PROJECT_LABEL "Services: Snowballs Collision")
-ENDIF(WIN32)
+ADD_EXECUTABLE(snowballs_collision_service WIN32 ${SRC})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(snowballs_collision_service
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc
+						nelnet
+						nelpacs
+						nel3d)
+
+NL_DEFAULT_PROPS(snowballs_collision_service "Snowballs, Services: Collision")
+NL_ADD_RUNTIME_FLAGS(snowballs_collision_service)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS sno_collision RUNTIME DESTINATION sbin COMPONENT services)
+INSTALL(TARGETS snowballs_collision_service RUNTIME DESTINATION sbin COMPONENT services)

code/snowballs2/server/frontend/src/CMakeLists.txt

@@ -1,14 +1,18 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(sno_frontend ${SRC})
-
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(sno_frontend ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY})
-IF(WIN32)
-  SET_TARGET_PROPERTIES(sno_frontend PROPERTIES 
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
-	PROJECT_LABEL "Services: Snowballs Frontend")
-ENDIF(WIN32)
+ADD_EXECUTABLE(snowballs_frontend_service ${SRC})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(snowballs_frontend_service
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc
+						nelnet)
+
+NL_DEFAULT_PROPS(snowballs_frontend_service "Snowballs, Services: Frontend Service")
+NL_ADD_RUNTIME_FLAGS(snowballs_frontend_service)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS sno_frontend RUNTIME DESTINATION sbin COMPONENT services)
+INSTALL(TARGETS snowballs_frontend_service RUNTIME DESTINATION sbin COMPONENT services)

code/snowballs2/server/position/src/CMakeLists.txt

@@ -1,11 +1,13 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(sno_position WIN32 ${SRC})
+ADD_EXECUTABLE(snowballs_position_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${NELMISC_INCLUDE_DIRS})
+TARGET_LINK_LIBRARIES(snowballs_position_service
+						${PLATFORM_LINKFLAGS}
+						nelmisc
+						nelnet)
 
-TARGET_LINK_LIBRARIES(sno_position ${PLATFORM_LINKFLAGS} ${NELMISC_LIBRARY} ${NELNET_LIBRARY})
-NL_DEFAULT_PROPS(sno_position "Services: Snowballs Position")
-NL_ADD_RUNTIME_FLAGS(sno_position)
+NL_DEFAULT_PROPS(snowballs_position_service "Snowballs, Services: Position Service")
+NL_ADD_RUNTIME_FLAGS(snowballs_position_service)
 
-INSTALL(TARGETS sno_position RUNTIME DESTINATION sbin COMPONENT services)
+INSTALL(TARGETS snowballs_position_service RUNTIME DESTINATION sbin COMPONENT services)