Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

merge

Browse Source
hg/feature/sound
rti 15 years ago
parent ff95aa3e84 1a695c444b
commit f632c2edc0
22 changed files with 221 additions and 33 deletions
Show Stats Download Patch File Download Diff File

12
code/ryzom/server/src/CMakeLists.txt
Unescape Escape View File

@ -7,17 +7,21 @@ ADD_SUBDIRECTORY(pd_lib)
ADD_SUBDIRECTORY(frontend_service)
ADD_SUBDIRECTORY(entities_game_service)
ADD_SUBDIRECTORY(ai_service)
ADD_SUBDIRECTORY(backup_service)
ADD_SUBDIRECTORY(dynamic_scenario_service)
# Deprecated, no longer used.
#ADD_SUBDIRECTORY(ai_data_service)
#ADD_SUBDIRECTORY(entity_view_service)
#ADD_SUBDIRECTORY(general_utilities_service)
#ags_test
#
#backup_service
#dynamic_scenario_service
#
#
#entity_view_service
#general_utilities_service
#
#gpm_service
#input_output_service
#log_analyser_service

2
code/ryzom/server/src/ai_service/CMakeLists.txt
Unescape Escape View File

@ -36,7 +36,7 @@ TARGET_LINK_LIBRARIES(ai_service admin_modules
IF(WIN32)
SET_TARGET_PROPERTIES(ai_service PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Services: Frontend Service (FS)")
PROJECT_LABEL "Services: AI Service (AIS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

11
code/ryzom/server/src/ai_share/CMakeLists.txt
Unescape Escape View File

@ -1,13 +1,14 @@
FILE(GLOB SRC *.cpp *.h)
# Filter out the source files not actually compiled.
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/world_map.cpp
${CMAKE_CURRENT_SOURCE_DIR}/world_map.h)
ADD_LIBRARY(ai_share STATIC ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ai_share ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELPACS_LIBRARY})
TARGET_LINK_LIBRARIES(ai_share game_share
server_share
${NELMISC_LIBRARY}
${NELNET_LIBRARY}
${NELGEORGES_LIBRARY}
${NELPACS_LIBRARY})
SET_TARGET_PROPERTIES(ai_share PROPERTIES VERSION ${NL_VERSION})
IF(WIN32)

24
code/ryzom/server/src/backup_service/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,24 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(backup_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(backup_service admin_modules
game_share
server_share
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
${NELMISC_LIBRARY}
${NELNET_LIBRARY}
${NELGEORGES_LIBRARY}
${NELLIGO_LIBRARY})
IF(WIN32)
SET_TARGET_PROPERTIES(backup_service PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Services: Backup Service (BS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS backup_service RUNTIME DESTINATION sbin COMPONENT services)

27
code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,27 @@
FILE(GLOB SRC *.cpp *.h)
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/service.cpp ${CMAKE_CURRENT_SOURCE_DIR}/service.h)
ADD_EXECUTABLE(dynamic_scenario_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(dynamic_scenario_service admin_modules
game_share
server_share
ai_share
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
${NELMISC_LIBRARY}
${NELNET_LIBRARY}
${NELGEORGES_LIBRARY}
${NELLIGO_LIBRARY})
IF(WIN32)
SET_TARGET_PROPERTIES(dynamic_scenario_service PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Services: Dynamic Scenario Service (DSS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS dynamic_scenario_service RUNTIME DESTINATION sbin COMPONENT services)

27
code/ryzom/server/src/entity_view_service/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,27 @@
FILE(GLOB SRC *.cpp *.h)
#LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/service.cpp ${CMAKE_CURRENT_SOURCE_DIR}/service.h)
ADD_EXECUTABLE(entity_view_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(entity_view_service admin_modules
game_share
server_share
ai_share
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
${NELMISC_LIBRARY}
${NELNET_LIBRARY}
${NELGEORGES_LIBRARY}
${NELLIGO_LIBRARY})
IF(WIN32)
SET_TARGET_PROPERTIES(entity_view_service PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Services: Entity View Service (EVS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS entity_view_service RUNTIME DESTINATION sbin COMPONENT services)

39
code/ryzom/server/src/general_utilities_service/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,39 @@
FILE(GLOB SRC *.cpp *.h)
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ stat_job_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/ec_event_chat.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gus_mfc_popups.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gus_mfc_popups.h
${CMAKE_CURRENT_SOURCE_DIR}/gus_mfc_select_with_text.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gus_mfc_select_with_text.h
${CMAKE_CURRENT_SOURCE_DIR}/re_module_itf.cpp
${CMAKE_CURRENT_SOURCE_DIR}/re_module_itf.h
${CMAKE_CURRENT_SOURCE_DIR}/re_repository_emitter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h
${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.cpp)
ADD_EXECUTABLE(general_utilities_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(general_utilities_service admin_modules
game_share
server_share
ai_share
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
${NELMISC_LIBRARY}
${NELNET_LIBRARY}
${NELGEORGES_LIBRARY}
${NELLIGO_LIBRARY})
IF(WIN32)
SET_TARGET_PROPERTIES(general_utilities_service PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Services: General Utilities Service (GUS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS general_utilities_service RUNTIME DESTINATION sbin COMPONENT services)

3
code/ryzom/tools/CMakeLists.txt
Unescape Escape View File

@ -9,12 +9,13 @@ ADD_SUBDIRECTORY(leveldesign)
ADD_SUBDIRECTORY(patch_gen)
ADD_SUBDIRECTORY(pdr_util)
ADD_SUBDIRECTORY(stats_scan)
ADD_SUBDIRECTORY(sheets_packer)
# Old stuff that doesn't compile anymore.
#ADD_SUBDIRECTORY(occ2huff)
#ADD_SUBDIRECTORY(phrase_generator)
#ADD_SUBDIRECTORY(sheet_random_generator)
#ADD_SUBDIRECTORY(sheets_packer) - this relies on something in the client
#- this relies on something in the client
# Not building these
#xml_packer - this is in NeL tools.

14
code/ryzom/tools/leveldesign/CMakeLists.txt
Unescape Escape View File

@ -1,11 +1,13 @@
ADD_SUBDIRECTORY(alias_synchronizer)
ADD_SUBDIRECTORY(prim_export)
ADD_SUBDIRECTORY(uni_conv)
ADD_SUBDIRECTORY(csv_transform)
ADD_SUBDIRECTORY(icon_search)
# Not working for one reason or another. Old code?
#ADD_SUBDIRECTORY(csv_transform)
# Legacy folders, do not build
#ADD_SUBDIRECTORY(export)
# folders not handled yet.
#export
#georges_convert
#georges_dll
#georges_exe
@ -19,9 +21,9 @@ ADD_SUBDIRECTORY(alias_synchronizer)
#mission_simulator
#mp_generator
#named_items_2_csv
#prim_export
#
#primitive_id_assignator
#test_root
#uni_conv
#
#variable_parser
#world_editor

2
code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt
Unescape Escape View File

@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(csv_transform ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
TARGET_LINK_LIBRARIES(csv_transform ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

1
code/ryzom/tools/leveldesign/csv_transform/csv_transform.cpp
Unescape Escape View File

@ -18,7 +18,6 @@
//
#include <nel/misc/types_nl.h>
#include "conio.h"
#include "nel/misc/sstring.h"
#include "nel/misc/file.h"

2
code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_input.h
Unescape Escape View File

@ -33,8 +33,6 @@
#include "sadge_lib/include/text_output.h"
#include <stdio.h>
#include <io.h>
//----------------------------------------------------------------------
// CTextInput - an object that encapsulates output

2
code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h
Unescape Escape View File

@ -35,8 +35,6 @@
#include "nel/misc/sstring.h"
#include <stdio.h>
#include <io.h>
//----------------------------------------------------------------------
// CTextOutput - an object that encapsulates output

9
code/ryzom/tools/leveldesign/export/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,9 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(export ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
TARGET_LINK_LIBRARIES(export ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS export RUNTIME DESTINATION bin COMPONENT tools)

8
code/ryzom/tools/leveldesign/export/export.cpp
Unescape Escape View File

@ -17,11 +17,13 @@
#include "export.h"
#include "formFlora.h"
#include "formPlant.h"
#ifdef NL_OS_WINDOWS
#include <windows.h>
#undef max
#undef min
#include "ligo/zone_region.h"
#endif // NL_OS_WINDOWS
#include "nel/ligo/zone_region.h"
#include "nel/ligo/primitive.h"
#include "nel/georges/u_form_loader.h"
@ -42,8 +44,6 @@
#include "tools.h"
#include "../master/continentcfg.h"
#include <windows.h>
using namespace std;
using namespace NLMISC;
using namespace NL3D;

9
code/ryzom/tools/leveldesign/icon_search/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,9 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(icon_search ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(icon_search ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS icon_search RUNTIME DESTINATION bin COMPONENT tools)

2
code/ryzom/tools/leveldesign/icon_search/icon_search.cpp
Unescape Escape View File

@ -264,7 +264,7 @@ void ProcessDirectory( const CSString& dir, const StringVector& extensions )
printf( " %d results found\n\n", nbResults );
}
void main()
int main()
{
StringVector extensions;

11
code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,11 @@
FILE(GLOB SRC *.cpp *.h)
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ named_items_2_csv.cpp)
ADD_EXECUTABLE(named2csv ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(named2csv ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS named2csv RUNTIME DESTINATION bin COMPONENT tools)

14
code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,14 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(prim_export ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(prim_export ${NELMISC_LIBRARY}
${NELLIGO_LIBRARY}
${NEL3D_LIBRARY}
${NELGEORGES_LIBRARY}
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES})
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS prim_export RUNTIME DESTINATION bin COMPONENT tools)

7
code/ryzom/tools/leveldesign/prim_export/main.cpp
Unescape Escape View File

@ -16,6 +16,7 @@
#include <stdio.h>
#include <string>
#include <sstream>
#include "nel/misc/config_file.h"
#include "nel/misc/file.h"
@ -34,7 +35,9 @@
#include "nel/3d/landscape.h"
#include "nel/3d/scene_group.h"
#ifdef NL_OS_WINDOWS
#include <windows.h>
#endif // NL_OS_WINDOWS
// ***************************************************************************
@ -225,7 +228,7 @@ sint getYFromZoneName (const string &ZoneName)
// ***************************************************************************
void outString (string &sText)
void outString (const string &sText)
{
createDebug ();
InfoLog->displayRaw(sText.c_str());
@ -1144,4 +1147,4 @@ int main (int argc, char**argv)
sint x = (sint)floor (position.x / options.CellSize);
sint y = (sint)floor (position.y / options.CellSize);
*/
*/

9
code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt
Unescape Escape View File

@ -0,0 +1,9 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(uni_conv ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(uni_conv ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS uni_conv RUNTIME DESTINATION bin COMPONENT tools)

19
code/ryzom/tools/sheets_packer/CMakeLists.txt
Unescape Escape View File

@ -1,9 +1,22 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(sheets_packer ${SRC})
ADD_EXECUTABLE(sheets_packer ${SRC}
${CMAKE_SOURCE_DIR}/client/src/continent_manager_build.cpp
${CMAKE_SOURCE_DIR}/client/src/continent_manager_build.h
${CMAKE_SOURCE_DIR}/client/src/sheet_manager.cpp
${CMAKE_SOURCE_DIR}/client/src/sheet_manager.h)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELGEORGES_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(sheets_packer ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELGEORGES_LIBRARY})
INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR}
${NEL_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/client/src)
TARGET_LINK_LIBRARIES(sheets_packer client_sheets
game_share
${NELMISC_LIBRARY}
${NELGEORGES_LIBRARY}
${NELNET_LIBRARY}
${NELLIGO_LIBRARY}
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} )
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS sheets_packer RUNTIME DESTINATION bin COMPONENT tools)

Write Preview
Loading…
Cancel
Save