sb4.diff

dfighter, 06/23/2011 07:53 pm

Download (7.5 kB)

b/code/CMakeLists.txt Thu Jun 23 19:44:08 2011 +0200
143 143 
ENDIF(WITH_RYZOM)
144 144 






145
145


IF(WITH_NELNS)







146



#  ADD_SUBDIRECTORY(nelns)








146


  ADD_SUBDIRECTORY(nelns)







147
147


ENDIF(WITH_NELNS)







148
148








149
149


IF(WITH_SNOWBALLS)







150



#  ADD_SUBDIRECTORY(snowballs2)








150


  ADD_SUBDIRECTORY(snowballs2)







151
151


ENDIF(WITH_SNOWBALLS)







152
152








153
153


IF(WITH_TOOLS)


















b/code/snowballs2/CMakeLists.txt Thu Jun 23 19:44:08 2011 +0200







6
6








7
7








8
8


#-----------------------------------------------------------------------------







9



# Set default config options







10



#







11



NL_SETUP_DEFAULT_OPTIONS()







12



NL_SETUP_PREFIX_PATHS()







13









14



#-----------------------------------------------------------------------------







15
9


# Override default options







16



OPTION(BUILD_CLIENT "Build the Snowballs Client" ON)







17



OPTION(ENABLE_SOUND "Enable sound in the Snowballs Client" OFF)







18









19



OPTION(BUILD_SERVER "Build the Snowballs Servers" ON)







20
10


SET(SNOWBALLS_CONFIG_FILE "${NL_ETC_PREFIX}/snowballs" CACHE FILEPATH "Snowballs config file location")







21
11


SET(SNOWBALLS_DATA_FILE "${NL_SHARE_PREFIX}/games/snowballs" CACHE FILEPATH "Snowballs data file location")







22
12


SET(SNOWBALLS_LOG_FILE "${NL_LOG_PREFIX}/snowballs" CACHE FILEPATH "Snowballs log file location")







......




29
19


FIND_PACKAGE(LibXml2 REQUIRED)







30
20


FIND_PACKAGE(PNG REQUIRED)







31
21








32



NL_SETUP_BUILD()







33









34



FIND_PACKAGE(NeL COMPONENTS nelmisc nelgeorges nel3d nelnet nelpacs REQUIRED)







35



FIND_PACKAGE(NeLNS COMPONENTS naming_service login_service welcome_service nel_launcher_qt)







36









37
22


###







38
23


# An example of finding NeL 3D and CEGUI Renderer.







39
24


###







40



IF(BUILD_CLIENT)








25


IF(WITH_SNOWBALLS_CLIENT)







41
26


  FIND_PACKAGE(FreeType)







42



  FIND_PACKAGE(Jpeg)







43



  







44



  IF(ENABLE_SOUND)







45



    FIND_PACKAGE(NeL COMPONENTS nelsound)







46



  ENDIF(ENABLE_SOUND)







47



ENDIF(BUILD_CLIENT)







48









49



IF(WIN32)







50



  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)







51



  SET(WINSOCK2_LIB ws2_32.lib)







52



ENDIF(WIN32)







53









54



NL_SETUP_BUILD_FLAGS()








27


ENDIF(WITH_SNOWBALLS_CLIENT)







55
28








56
29


ADD_DEFINITIONS(-DSNOWBALLS_CONFIG="${SNOWBALLS_CONFIG_FILE}/" -DSNOWBALLS_STATE="${SNOWBALLS_LOG_FILE}/" -DSNOWBALLS_LOGS="${SNOWBALLS_LOG_FILE}/")







57
30








58



IF(BUILD_CLIENT)








31


IF(WITH_SNOWBALLS_CLIENT)







59
32


  ADD_SUBDIRECTORY(client)







60



ENDIF(BUILD_CLIENT)








33


ENDIF(WITH_SNOWBALLS_CLIENT)







61
34








62



IF(BUILD_SERVER)








35


IF(WITH_SNOWBALLS_SERVER)







63
36


  ADD_SUBDIRECTORY(server)







64



ENDIF(BUILD_SERVER)








37


ENDIF(WITH_SNOWBALLS_SERVER)







65
38








66
39


# packaging information







67
40


SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "NeL MMORPG Framework - Snowballs Demo")







......




112
85


    SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)







113
86


  ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release")







114
87


  







115



  IF(BUILD_CLIENT)








88


  IF(WITH_SNOWBALLS_CLIENT)








89


    IF( WITH_QT )







116
90


	# Needed to find dependencies for nel_launcher_qt.







117
91


	FIND_PACKAGE(Qt4 REQUIRED)







118
92


	







119



    # Install Qt dependencies for the launcher.







120



    INCLUDE(${QT_USE_FILE})







121



    INSTALL(FILES 







122



        "${QT_LIBRARY_DIR}/QtGuid4.dll"        







123



        "${QT_LIBRARY_DIR}/QtXmld4.dll"







124



        "${QT_LIBRARY_DIR}/QtCored4.dll"







125



        DESTINATION bin)








93


        # Install Qt dependencies for the launcher.








94


        INCLUDE(${QT_USE_FILE})








95


        INSTALL(FILES 








96


           "${QT_BINARY_DIR}/QtGuid4.dll"        








97


           "${QT_BINARY_DIR}/QtXmld4.dll"








98


           "${QT_BINARY_DIR}/QtCored4.dll"








99


           DESTINATION bin)







126
100


        







127



     # Install the Qt Launcher.







128



     INSTALL(FILES ${NELNS_NEL_LAUNCHER_BIN} DESTINATION bin COMPONENT snowballsclient)








101


         # Install the Qt Launcher.








102


         INSTALL(FILES ${NELNS_NEL_LAUNCHER_BIN} DESTINATION bin COMPONENT snowballsclient)








103


     ENDIF( WITH_QT )







129
104


     







130
105


     # Install the sound/video drivers







131
106


     INSTALL(FILES ${NELDRVOPENGL_DLL} ${NELDRVDIRECT3D_DLL} DESTINATION bin COMPONENT snowballsclient)







132



  ENDIF(BUILD_CLIENT)








107


  ENDIF(WITH_SNOWBALLS_CLIENT)







133
108


  







134



  IF(BUILD_SERVER)








109


  IF(WITH_SNOWBALLS_SERVER)







135
110


    INSTALL(FILES 







136
111


		${NELNS_NAMING_SERVICE_BIN} 







137
112


		${NELNS_NAMING_SERVICE_CFG} 







......




141
116


		${NELNS_WELCOME_SERVICE_CFG}







142
117


		DESTINATION sbin 







143
118


		COMPONENT services)







144



  ENDIF(BUILD_SERVER)








119


  ENDIF(WITH_SNOWBALLS_SERVER)







145
120


  







146
121


  INCLUDE(InstallRequiredSystemLibraries)







147
122


ENDIF(WIN32)


















b/code/snowballs2/client/CMakeLists.txt Thu Jun 23 19:44:08 2011 +0200







4
4


CONFIGURE_FILE(client.cfg.in client.cfg)







5
5








6
6


INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/client.cfg DESTINATION etc/snowballs COMPONENT snowballsclient)







7



INSTALL(DIRECTORY data/







8



        DESTINATION share/games/snowballs







9



	COMPONENT snowballsdata







10



        PATTERN "CVS" EXCLUDE







11



        PATTERN ".svn" EXCLUDE







12



        PATTERN "Makefile*" EXCLUDE)








7



















b/code/snowballs2/client/src/snowballs_client.cpp Thu Jun 23 19:44:08 2011 +0200







70
70


#include "internationalization.h"







71
71


#include "game_time.h"







72
72









73


#ifdef NL_OS_WINDOWS








74


#include <Windows.h>








75


#endif








76








73
77


using namespace std;







74
78


using namespace NLMISC;







75
79


using namespace NL3D;


















b/code/snowballs2/server/chat/src/main.cpp Thu Jun 23 19:44:08 2011 +0200







36
36


// We're using the NeL Service framework, and layer 5







37
37


#include <nel/net/service.h>







38
38









39


#ifdef NL_OS_WINDOWS








40


#include <Windows.h>








41


#endif








42








39
43








40
44


using namespace std;







41
45


using namespace NLMISC;


















b/code/snowballs2/server/collision/src/collision_service.cpp Thu Jun 23 19:44:08 2011 +0200







17
17


#include "collision_service.h"







18
18


#include <nel/3d/u_instance_group.h>







19
19









20


#ifdef NL_OS_WINDOWS








21


#include <Windows.h>








22


#endif








23









24








20
25


using namespace SBSERVICE;







21
26


using namespace NLMISC;







22
27


using namespace NLNET;


















b/code/snowballs2/server/frontend/src/CMakeLists.txt Thu Jun 23 19:44:08 2011 +0200







1
1


FILE(GLOB SRC *.cpp *.h)







2
2








3



ADD_EXECUTABLE(snowballs_frontend_service ${SRC})








3


ADD_EXECUTABLE(snowballs_frontend_service WIN32 ${SRC})







4
4








5
5


INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})







6
6



















b/code/snowballs2/server/frontend/src/main.cpp Thu Jun 23 19:44:08 2011 +0200







38
38


#include <map>







39
39


#include <utility>







40
40









41


#ifdef NL_OS_WINDOWS








42


#include <Windows.h>








43


#endif








44









45








41
46


using namespace NLMISC;







42
47


using namespace NLNET;







43
48


using namespace std;


















b/code/snowballs2/server/position/src/main.cpp Thu Jun 23 19:44:08 2011 +0200







41
41








42
42


#include "physics.h"







43
43









44


#ifdef NL_OS_WINDOWS








45


#include <Windows.h>








46


#endif








47








44
48








45
49


using namespace NLMISC;







46
50


using namespace NLNET;