From a64e68cf911390bfacd8747399f1f2e2eb7c7d2e Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 2 Mar 2012 22:29:06 +0100 Subject: [PATCH 01/20] Patched: #1387 Wrong includes in some max plugins --- code/nel/tools/3d/ligo/plugin_max/script.cpp | 2 +- code/nel/tools/3d/plugin_max/nel_export/std_afx.h | 2 +- code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/nel/tools/3d/ligo/plugin_max/script.cpp b/code/nel/tools/3d/ligo/plugin_max/script.cpp index 90050304f..b00de5fe4 100644 --- a/code/nel/tools/3d/ligo/plugin_max/script.cpp +++ b/code/nel/tools/3d/ligo/plugin_max/script.cpp @@ -29,7 +29,7 @@ # include # include # include -# include +# include #else # include # include diff --git a/code/nel/tools/3d/plugin_max/nel_export/std_afx.h b/code/nel/tools/3d/plugin_max/nel_export/std_afx.h index 099f2f882..7d0ef0b2a 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/std_afx.h +++ b/code/nel/tools/3d/plugin_max/nel_export/std_afx.h @@ -36,7 +36,7 @@ # include # include # include -# include +# include #else # include # include diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp index 1dfdc97f4..8433e5001 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp +++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp @@ -33,7 +33,7 @@ # include # include # include -# include +# include #else # include # include From c2de0eeb3131681fc9f9bbffb7e75f9971dbfcae Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 2 Mar 2012 22:43:42 +0100 Subject: [PATCH 02/20] Fixed: #620 Incorrect usage of mutex in particle system loader --- code/nel/src/3d/particle_system_shape.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/nel/src/3d/particle_system_shape.cpp b/code/nel/src/3d/particle_system_shape.cpp index 5e41ba530..fb7aaa405 100644 --- a/code/nel/src/3d/particle_system_shape.cpp +++ b/code/nel/src/3d/particle_system_shape.cpp @@ -39,7 +39,11 @@ namespace NL3D { using NLMISC::CIFile; +namespace { +NLMISC::CMutex s_PSSMutex; + +} /* anonymous namespace */ // private usage : macro to check the memory integrity #if defined(NL_DEBUG) && defined(NL_OS_WINDOWS) @@ -220,9 +224,8 @@ CParticleSystem *CParticleSystemShape::instanciatePS(CScene &scene, NLMISC::CCon return _SharedSystem; } - // avoid prb with concurent thread (may append if an instance group containing ps is loaded in background) - NLMISC::CMutex mutex; - mutex.enter(); + // avoid prb with concurrent thread (may happen if an instance group containing ps is loaded in background) + s_PSSMutex.enter(); #ifdef PS_FAST_ALLOC @@ -295,7 +298,7 @@ CParticleSystem *CParticleSystemShape::instanciatePS(CScene &scene, NLMISC::CCon } #endif - mutex.leave(); + s_PSSMutex.leave(); /*NLMISC::TTicks end = NLMISC::CTime::getPerformanceTime(); nlinfo("instanciation time = %.2f", (float) (1000 * NLMISC::CTime::ticksToSecond(end - start))); */ @@ -390,8 +393,7 @@ void CParticleSystemShape::flushTextures(IDriver &driver, uint selectedTexture) } else { - NLMISC::CMutex mutex; - mutex.enter(); + s_PSSMutex.enter(); // must create an instance just to flush the textures CParticleSystem *myInstance = NULL; @@ -436,7 +438,7 @@ void CParticleSystemShape::flushTextures(IDriver &driver, uint selectedTexture) #ifdef PS_FAST_ALLOC PSBlockAllocator = NULL; #endif - mutex.leave(); + s_PSSMutex.leave(); } for(uint k = 0; k < _CachedTex.size(); ++k) { From 41551e302610adb23e08c4baf56ca795d97b9d5a Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 3 Mar 2012 10:49:42 +0100 Subject: [PATCH 03/20] Fixed: #1441 Remove all remaining .vcproj, Makefiles, automake scripts, etc... --- code/acinclude.m4 | 1396 -------- code/nel/Makefile.am | 46 - code/nel/acinclude.m4 | 1214 ------- code/nel/autogen.sh | 32 - code/nel/automacros/gtk-2.0.m4 | 196 -- code/nel/automacros/ogg.m4 | 102 - code/nel/automacros/pkg.m4 | 157 - code/nel/automacros/vorbis.m4 | 122 - code/nel/configure.ac | 599 ---- code/nel/include/Makefile.am | 10 - code/nel/include/nel/3d/Makefile.am | 343 -- code/nel/include/nel/Makefile.am | 13 - code/nel/include/nel/cegui/Makefile.am | 11 - code/nel/include/nel/georges/Makefile.am | 15 - code/nel/include/nel/ligo/Makefile.am | 14 - code/nel/include/nel/misc/Makefile.am | 143 - code/nel/include/nel/net/Makefile.am | 48 - code/nel/include/nel/pacs/Makefile.am | 17 - code/nel/include/nel/sound/Makefile.am | 15 - code/nel/nel.m4 | 0 code/nel/samples/3d/Makefile.am | 11 - code/nel/samples/3d/cegui/Makefile.am | 22 - .../nel/samples/3d/cluster_viewer/Makefile.am | 24 - .../3d/cluster_viewer/fonts/Makefile.am | 12 - .../3d/cluster_viewer/groups/Makefile.am | 12 - .../3d/cluster_viewer/shapes/Makefile.am | 20 - code/nel/samples/3d/font/Makefile.am | 21 - code/nel/samples/Makefile.am | 12 - code/nel/samples/georges/Makefile.am | 24 - code/nel/samples/misc/Makefile.am | 10 - code/nel/samples/misc/command/Makefile.am | 20 - code/nel/samples/misc/configfile/Makefile.am | 23 - code/nel/samples/misc/debug/Makefile.am | 20 - code/nel/samples/misc/i18n/Makefile.am | 23 - code/nel/samples/misc/log/Makefile.am | 20 - code/nel/samples/misc/strings/Makefile.am | 20 - code/nel/samples/misc/types_check/Makefile.am | 20 - code/nel/samples/net/Makefile.am | 11 - code/nel/samples/net/chat/Makefile.am | 27 - code/nel/samples/net/login_system/Makefile.am | 30 - code/nel/samples/net/udp/Makefile.am | 32 - code/nel/samples/pacs/Makefile.am | 19 - code/nel/samples/sound_sources/Makefile.am | 23 - code/nel/src/3d/Makefile.am | 616 ---- code/nel/src/3d/driver/Makefile.am | 10 - code/nel/src/3d/driver/opengl/Makefile.am | 47 - code/nel/src/Makefile.am | 19 - code/nel/src/Rules.mk | 56 - code/nel/src/Variables.mk | 20 - code/nel/src/cegui/Makefile.am | 19 - code/nel/src/gen_deps.sh | 25 - code/nel/src/georges/Makefile.am | 34 - code/nel/src/ligo/Makefile.am | 36 - code/nel/src/misc/Makefile.am | 142 - code/nel/src/misc/config_file/Makefile.am | 21 - code/nel/src/net/Makefile.am | 60 - code/nel/src/pacs/Makefile.am | 69 - code/nel/src/sound/Makefile.am | 75 - code/nel/src/sound/driver/Makefile.am | 26 - code/nel/src/sound/driver/fmod/Makefile.am | 32 - code/nel/src/sound/driver/openal/Makefile.am | 30 - code/nel/tools/3d/Makefile.am | 32 - .../tools/3d/build_coarse_mesh/Makefile.am | 21 - code/nel/tools/3d/build_far_bank/Makefile.am | 20 - code/nel/tools/3d/build_smallbank/Makefile.am | 20 - code/nel/tools/3d/ig_lighter/Makefile.am | 23 - code/nel/tools/3d/ig_lighter_lib/Makefile.am | 23 - code/nel/tools/3d/panoply_maker/Makefile.am | 24 - .../tools/3d/zone_dependencies/Makefile.am | 22 - code/nel/tools/3d/zone_ig_lighter/Makefile.am | 21 - code/nel/tools/3d/zone_lib/Makefile.am | 20 - code/nel/tools/3d/zone_lighter/Makefile.am | 22 - code/nel/tools/3d/zone_welder/Makefile.am | 22 - code/nel/tools/Makefile.am | 11 - code/nel/tools/misc/Makefile.am | 13 - code/nel/tools/misc/bnp_make/Makefile.am | 19 - code/nel/tools/misc/disp_sheet_id/Makefile.am | 19 - code/nel/tools/misc/make_sheet_id/Makefile.am | 19 - code/nel/tools/misc/xml_packer/Makefile.am | 18 - code/nel/tools/pacs/Makefile.am | 10 - .../nel/tools/pacs/build_ig_boxes/Makefile.am | 21 - .../tools/pacs/build_indoor_rbank/Makefile.am | 20 - code/nel/tools/pacs/build_rbank/Makefile.am | 23 - code/nelns/Makefile.am | 23 - code/nelns/acinclude.m4 | 1217 ------- code/nelns/admin_executor_service/Makefile.am | 25 - code/nelns/admin_service/Makefile.am | 24 - code/nelns/autogen.sh | 15 - code/nelns/automacros/mysql.m4 | 101 - code/nelns/configure.ac | 186 -- code/nelns/login_service/Makefile.am | 33 - code/nelns/naming_service/Makefile.am | 22 - code/nelns/welcome_service/Makefile.am | 23 - code/ryzom/Makefile | 37 - code/ryzom/Rules.mk | 64 - code/ryzom/Variables.mk | 33 - code/ryzom/client/Makefile | 18 - code/ryzom/client/src/Makefile | 79 - code/ryzom/client/src/client_sheets/Makefile | 37 - code/ryzom/client/src/seven_zip/Makefile | 38 - code/ryzom/common/Makefile | 29 - code/ryzom/common/src/Makefile | 36 - code/ryzom/common/src/game_share/Makefile | 56 - .../common/src/game_share/game_share.vcproj | 1720 ---------- code/ryzom/gen_deps.sh | 24 - code/ryzom/server/Makefile | 29 - code/ryzom/server/src/Makefile | 73 - code/ryzom/server/src/admin_modules/Makefile | 38 - .../src/admin_modules/admin_modules.vcproj | 321 -- code/ryzom/server/src/ags_test/Makefile | 43 - code/ryzom/server/src/ai_service/Makefile | 65 - .../server/src/ai_service/ai_service.vcproj | 1260 ------- .../src/ai_service/doc/doxycfg/Makefile | 36 - code/ryzom/server/src/ai_share/Makefile | 53 - .../ryzom/server/src/ai_share/ai_share.vcproj | 481 --- code/ryzom/server/src/backup_service/Makefile | 56 - .../src/backup_service/backup_service.vcproj | 379 --- .../src/dynamic_scenario_service/Makefile | 64 - .../dynamic_scenario_service.vcproj | 356 -- .../server/src/entities_game_service/Makefile | 92 - .../entities_game_service.vcproj | 2976 ----------------- .../server/src/frontend_service/Makefile | 72 - .../frontend_service/frontend_service.vcproj | 600 ---- .../server/src/gameplay_module_lib/Makefile | 48 - .../gameplay_module_lib.vcproj | 349 -- code/ryzom/server/src/gen_compile_flags.sh | 11 - code/ryzom/server/src/gen_deps.sh | 25 - .../src/general_utilities_service/Makefile | 52 - .../general_utilities_service.vcproj | 649 ---- code/ryzom/server/src/gpm_service/Makefile | 59 - .../server/src/gpm_service/gpm_service.vcproj | 460 --- .../server/src/input_output_service/Makefile | 59 - .../input_output_service.vcproj | 480 --- .../server/src/log_analyser_service/Makefile | 54 - .../log_analyser_service.vcproj | 186 -- code/ryzom/server/src/logger_service/Makefile | 56 - .../src/logger_service/logger_service.vcproj | 368 -- .../server/src/mail_forum_service/Makefile | 56 - .../mail_forum_service.vcproj | 420 --- code/ryzom/server/src/mirror_service/Makefile | 53 - .../src/mirror_service/mirror_service.vcproj | 376 --- .../ryzom/server/src/monitor_service/Makefile | 54 - .../monitor_service/monitor_service.vcproj | 432 --- .../server/src/patchman_service/Makefile | 52 - code/ryzom/server/src/pd_lib/Makefile | 46 - code/ryzom/server/src/pd_lib/pd_lib.vcproj | 417 --- .../server/src/pd_reference_builder/Makefile | 46 - .../pd_reference_builder.vcproj | 372 --- .../server/src/pd_support_service/Makefile | 56 - .../pd_support_service.vcproj | 306 -- .../src/persistant_data_service/Makefile | 51 - .../persistant_data_service.vcproj | 436 --- .../server/src/ryzom_admin_service/Makefile | 50 - .../ryzom_admin_service.vcproj | 351 -- .../server/src/ryzom_naming_service/Makefile | 50 - .../ryzom_naming_service.vcproj | 351 -- .../server/src/ryzom_welcome_service/Makefile | 52 - .../ryzom_welcome_service.vcproj | 355 -- code/ryzom/server/src/server_share/Makefile | 56 - .../src/server_share/server_share.vcproj | 806 ----- .../src/session_browser_server/Makefile | 61 - .../session_browser_server.vcproj | 356 -- .../server/src/shard_unifier_service/Makefile | 59 - .../shard_unifier_service.vcproj | 468 --- code/ryzom/server/src/tick_service/Makefile | 54 - .../src/tick_service/tick_service.vcproj | 363 -- code/ryzom/server/src/update_cxxpath_flags.sh | 1 - code/ryzom/server/src/update_packed_sheets.sh | 32 - code/ryzom/tools/pdr_util/Makefile | 54 - code/snowballs2/Makefile.am | 20 - code/snowballs2/acinclude.m4 | 1213 ------- code/snowballs2/autogen.sh | 26 - code/snowballs2/client/Makefile.am | 17 - code/snowballs2/client/configure.in | 260 -- code/snowballs2/client/src/Makefile.am | 55 - code/snowballs2/configure.ac | 264 -- code/snowballs2/server/Makefile.am | 11 - code/snowballs2/server/chat/Makefile.am | 15 - code/snowballs2/server/chat/src/Makefile.am | 14 - code/snowballs2/server/frontend/Makefile.am | 15 - .../server/frontend/src/Makefile.am | 13 - code/snowballs2/server/position/Makefile.am | 15 - .../server/position/src/Makefile.am | 16 - 183 files changed, 29065 deletions(-) delete mode 100644 code/acinclude.m4 delete mode 100644 code/nel/Makefile.am delete mode 100644 code/nel/acinclude.m4 delete mode 100755 code/nel/autogen.sh delete mode 100644 code/nel/automacros/gtk-2.0.m4 delete mode 100644 code/nel/automacros/ogg.m4 delete mode 100644 code/nel/automacros/pkg.m4 delete mode 100644 code/nel/automacros/vorbis.m4 delete mode 100644 code/nel/configure.ac delete mode 100644 code/nel/include/Makefile.am delete mode 100644 code/nel/include/nel/3d/Makefile.am delete mode 100644 code/nel/include/nel/Makefile.am delete mode 100644 code/nel/include/nel/cegui/Makefile.am delete mode 100644 code/nel/include/nel/georges/Makefile.am delete mode 100644 code/nel/include/nel/ligo/Makefile.am delete mode 100644 code/nel/include/nel/misc/Makefile.am delete mode 100644 code/nel/include/nel/net/Makefile.am delete mode 100644 code/nel/include/nel/pacs/Makefile.am delete mode 100644 code/nel/include/nel/sound/Makefile.am delete mode 100644 code/nel/nel.m4 delete mode 100644 code/nel/samples/3d/Makefile.am delete mode 100644 code/nel/samples/3d/cegui/Makefile.am delete mode 100644 code/nel/samples/3d/cluster_viewer/Makefile.am delete mode 100644 code/nel/samples/3d/cluster_viewer/fonts/Makefile.am delete mode 100644 code/nel/samples/3d/cluster_viewer/groups/Makefile.am delete mode 100644 code/nel/samples/3d/cluster_viewer/shapes/Makefile.am delete mode 100644 code/nel/samples/3d/font/Makefile.am delete mode 100644 code/nel/samples/Makefile.am delete mode 100644 code/nel/samples/georges/Makefile.am delete mode 100644 code/nel/samples/misc/Makefile.am delete mode 100644 code/nel/samples/misc/command/Makefile.am delete mode 100644 code/nel/samples/misc/configfile/Makefile.am delete mode 100644 code/nel/samples/misc/debug/Makefile.am delete mode 100644 code/nel/samples/misc/i18n/Makefile.am delete mode 100644 code/nel/samples/misc/log/Makefile.am delete mode 100644 code/nel/samples/misc/strings/Makefile.am delete mode 100644 code/nel/samples/misc/types_check/Makefile.am delete mode 100644 code/nel/samples/net/Makefile.am delete mode 100644 code/nel/samples/net/chat/Makefile.am delete mode 100644 code/nel/samples/net/login_system/Makefile.am delete mode 100644 code/nel/samples/net/udp/Makefile.am delete mode 100644 code/nel/samples/pacs/Makefile.am delete mode 100644 code/nel/samples/sound_sources/Makefile.am delete mode 100644 code/nel/src/3d/Makefile.am delete mode 100644 code/nel/src/3d/driver/Makefile.am delete mode 100644 code/nel/src/3d/driver/opengl/Makefile.am delete mode 100644 code/nel/src/Makefile.am delete mode 100644 code/nel/src/Rules.mk delete mode 100644 code/nel/src/Variables.mk delete mode 100644 code/nel/src/cegui/Makefile.am delete mode 100755 code/nel/src/gen_deps.sh delete mode 100644 code/nel/src/georges/Makefile.am delete mode 100644 code/nel/src/ligo/Makefile.am delete mode 100644 code/nel/src/misc/Makefile.am delete mode 100644 code/nel/src/misc/config_file/Makefile.am delete mode 100644 code/nel/src/net/Makefile.am delete mode 100644 code/nel/src/pacs/Makefile.am delete mode 100644 code/nel/src/sound/Makefile.am delete mode 100644 code/nel/src/sound/driver/Makefile.am delete mode 100644 code/nel/src/sound/driver/fmod/Makefile.am delete mode 100644 code/nel/src/sound/driver/openal/Makefile.am delete mode 100644 code/nel/tools/3d/Makefile.am delete mode 100644 code/nel/tools/3d/build_coarse_mesh/Makefile.am delete mode 100644 code/nel/tools/3d/build_far_bank/Makefile.am delete mode 100644 code/nel/tools/3d/build_smallbank/Makefile.am delete mode 100644 code/nel/tools/3d/ig_lighter/Makefile.am delete mode 100644 code/nel/tools/3d/ig_lighter_lib/Makefile.am delete mode 100644 code/nel/tools/3d/panoply_maker/Makefile.am delete mode 100644 code/nel/tools/3d/zone_dependencies/Makefile.am delete mode 100644 code/nel/tools/3d/zone_ig_lighter/Makefile.am delete mode 100644 code/nel/tools/3d/zone_lib/Makefile.am delete mode 100644 code/nel/tools/3d/zone_lighter/Makefile.am delete mode 100644 code/nel/tools/3d/zone_welder/Makefile.am delete mode 100644 code/nel/tools/Makefile.am delete mode 100644 code/nel/tools/misc/Makefile.am delete mode 100644 code/nel/tools/misc/bnp_make/Makefile.am delete mode 100644 code/nel/tools/misc/disp_sheet_id/Makefile.am delete mode 100644 code/nel/tools/misc/make_sheet_id/Makefile.am delete mode 100644 code/nel/tools/misc/xml_packer/Makefile.am delete mode 100644 code/nel/tools/pacs/Makefile.am delete mode 100644 code/nel/tools/pacs/build_ig_boxes/Makefile.am delete mode 100644 code/nel/tools/pacs/build_indoor_rbank/Makefile.am delete mode 100644 code/nel/tools/pacs/build_rbank/Makefile.am delete mode 100644 code/nelns/Makefile.am delete mode 100644 code/nelns/acinclude.m4 delete mode 100644 code/nelns/admin_executor_service/Makefile.am delete mode 100644 code/nelns/admin_service/Makefile.am delete mode 100755 code/nelns/autogen.sh delete mode 100644 code/nelns/automacros/mysql.m4 delete mode 100644 code/nelns/configure.ac delete mode 100644 code/nelns/login_service/Makefile.am delete mode 100644 code/nelns/naming_service/Makefile.am delete mode 100644 code/nelns/welcome_service/Makefile.am delete mode 100644 code/ryzom/Makefile delete mode 100644 code/ryzom/Rules.mk delete mode 100644 code/ryzom/Variables.mk delete mode 100644 code/ryzom/client/Makefile delete mode 100644 code/ryzom/client/src/Makefile delete mode 100644 code/ryzom/client/src/client_sheets/Makefile delete mode 100644 code/ryzom/client/src/seven_zip/Makefile delete mode 100644 code/ryzom/common/Makefile delete mode 100644 code/ryzom/common/src/Makefile delete mode 100644 code/ryzom/common/src/game_share/Makefile delete mode 100644 code/ryzom/common/src/game_share/game_share.vcproj delete mode 100755 code/ryzom/gen_deps.sh delete mode 100644 code/ryzom/server/Makefile delete mode 100644 code/ryzom/server/src/Makefile delete mode 100644 code/ryzom/server/src/admin_modules/Makefile delete mode 100644 code/ryzom/server/src/admin_modules/admin_modules.vcproj delete mode 100644 code/ryzom/server/src/ags_test/Makefile delete mode 100644 code/ryzom/server/src/ai_service/Makefile delete mode 100644 code/ryzom/server/src/ai_service/ai_service.vcproj delete mode 100644 code/ryzom/server/src/ai_service/doc/doxycfg/Makefile delete mode 100644 code/ryzom/server/src/ai_share/Makefile delete mode 100644 code/ryzom/server/src/ai_share/ai_share.vcproj delete mode 100644 code/ryzom/server/src/backup_service/Makefile delete mode 100644 code/ryzom/server/src/backup_service/backup_service.vcproj delete mode 100644 code/ryzom/server/src/dynamic_scenario_service/Makefile delete mode 100644 code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.vcproj delete mode 100644 code/ryzom/server/src/entities_game_service/Makefile delete mode 100644 code/ryzom/server/src/entities_game_service/entities_game_service.vcproj delete mode 100644 code/ryzom/server/src/frontend_service/Makefile delete mode 100644 code/ryzom/server/src/frontend_service/frontend_service.vcproj delete mode 100644 code/ryzom/server/src/gameplay_module_lib/Makefile delete mode 100644 code/ryzom/server/src/gameplay_module_lib/gameplay_module_lib.vcproj delete mode 100644 code/ryzom/server/src/gen_compile_flags.sh delete mode 100755 code/ryzom/server/src/gen_deps.sh delete mode 100644 code/ryzom/server/src/general_utilities_service/Makefile delete mode 100644 code/ryzom/server/src/general_utilities_service/general_utilities_service.vcproj delete mode 100644 code/ryzom/server/src/gpm_service/Makefile delete mode 100644 code/ryzom/server/src/gpm_service/gpm_service.vcproj delete mode 100644 code/ryzom/server/src/input_output_service/Makefile delete mode 100644 code/ryzom/server/src/input_output_service/input_output_service.vcproj delete mode 100644 code/ryzom/server/src/log_analyser_service/Makefile delete mode 100644 code/ryzom/server/src/log_analyser_service/log_analyser_service.vcproj delete mode 100644 code/ryzom/server/src/logger_service/Makefile delete mode 100644 code/ryzom/server/src/logger_service/logger_service.vcproj delete mode 100644 code/ryzom/server/src/mail_forum_service/Makefile delete mode 100644 code/ryzom/server/src/mail_forum_service/mail_forum_service.vcproj delete mode 100644 code/ryzom/server/src/mirror_service/Makefile delete mode 100644 code/ryzom/server/src/mirror_service/mirror_service.vcproj delete mode 100644 code/ryzom/server/src/monitor_service/Makefile delete mode 100644 code/ryzom/server/src/monitor_service/monitor_service.vcproj delete mode 100644 code/ryzom/server/src/patchman_service/Makefile delete mode 100644 code/ryzom/server/src/pd_lib/Makefile delete mode 100644 code/ryzom/server/src/pd_lib/pd_lib.vcproj delete mode 100644 code/ryzom/server/src/pd_reference_builder/Makefile delete mode 100644 code/ryzom/server/src/pd_reference_builder/pd_reference_builder.vcproj delete mode 100644 code/ryzom/server/src/pd_support_service/Makefile delete mode 100644 code/ryzom/server/src/pd_support_service/pd_support_service.vcproj delete mode 100644 code/ryzom/server/src/persistant_data_service/Makefile delete mode 100644 code/ryzom/server/src/persistant_data_service/persistant_data_service.vcproj delete mode 100644 code/ryzom/server/src/ryzom_admin_service/Makefile delete mode 100644 code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.vcproj delete mode 100644 code/ryzom/server/src/ryzom_naming_service/Makefile delete mode 100644 code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.vcproj delete mode 100644 code/ryzom/server/src/ryzom_welcome_service/Makefile delete mode 100644 code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.vcproj delete mode 100644 code/ryzom/server/src/server_share/Makefile delete mode 100644 code/ryzom/server/src/server_share/server_share.vcproj delete mode 100644 code/ryzom/server/src/session_browser_server/Makefile delete mode 100644 code/ryzom/server/src/session_browser_server/session_browser_server.vcproj delete mode 100644 code/ryzom/server/src/shard_unifier_service/Makefile delete mode 100644 code/ryzom/server/src/shard_unifier_service/shard_unifier_service.vcproj delete mode 100644 code/ryzom/server/src/tick_service/Makefile delete mode 100644 code/ryzom/server/src/tick_service/tick_service.vcproj delete mode 100755 code/ryzom/server/src/update_cxxpath_flags.sh delete mode 100755 code/ryzom/server/src/update_packed_sheets.sh delete mode 100644 code/ryzom/tools/pdr_util/Makefile delete mode 100644 code/snowballs2/Makefile.am delete mode 100644 code/snowballs2/acinclude.m4 delete mode 100755 code/snowballs2/autogen.sh delete mode 100644 code/snowballs2/client/Makefile.am delete mode 100644 code/snowballs2/client/configure.in delete mode 100644 code/snowballs2/client/src/Makefile.am delete mode 100644 code/snowballs2/configure.ac delete mode 100644 code/snowballs2/server/Makefile.am delete mode 100644 code/snowballs2/server/chat/Makefile.am delete mode 100644 code/snowballs2/server/chat/src/Makefile.am delete mode 100644 code/snowballs2/server/frontend/Makefile.am delete mode 100644 code/snowballs2/server/frontend/src/Makefile.am delete mode 100644 code/snowballs2/server/position/Makefile.am delete mode 100644 code/snowballs2/server/position/src/Makefile.am diff --git a/code/acinclude.m4 b/code/acinclude.m4 deleted file mode 100644 index 1f9286bf9..000000000 --- a/code/acinclude.m4 +++ /dev/null @@ -1,1396 +0,0 @@ -# ========================================================================= -# -# Macros used by Nevrax in configure.in files. -# -# $Id: acinclude.m4,v 1.20 2005-04-04 10:07:29 cado Exp $ -# -# ========================================================================= - -# ========================================================================= -# WARNING: The original version of this file is placed in the $CVSROOT/code -# directory. -# There is links in the $CVSROOT/code sub-directories to that file -# (ex: $CVSROOT/code/nel), so be careful of the consequences of -# any modification of that file. -# ========================================================================= - -# ========================================================================= -# Macros available in that file. -# -# -# AM_NEL_DEBUG -# -# Option: none. -# Description: manage the different debug and the release mode by setting -# correctly the CFLAGS and CXXFLAGS variables. -# -# -# AM_PATH_NEL -# -# Option: none. -# Description: check the instalation of the NeL library and set the -# CXXFLAGS and LIBS variables to use it. -# -# -# AM_PATH_STLPORT -# -# Option: none. -# Description: check the instalation of the STLPort library and set the -# CXXFLAGS and LIBS variables to use it. -# -# -# AM_PATH_OPENGL -# -# Option: "yes" if the use of the OpenGL library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# OPENGL_CFLAGS and OPENGL_LIBS variables to use it. -# -# -# AM_PATH_FREETYPE -# -# Option: "yes" if the use of the Freetype library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# FREETYPE_CFLAGS and FREETYPE_LIBS variables to use it. -# -# -# AM_PATH_XF86VIDMODE -# -# Option: none. -# Description: check the instalation of the OpenGL library and set the -# XF86VIDMODE_CFLAGS and XF86VIDMODE_LIBS variables to use it. -# -# -# AM_PATH_OPENAL -# -# Option: "yes" if the use of the OpenAL library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# OPENAL_CFLAGS and OPENAL_LIBS variables to use it. -# -# -# AM_PATH_PYTHON -# -# Option: "yes" if the use of the Python library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# PYTHON_CFLAGS and PYTHON_LIBS variables to use it. -# -# AM_PATH_CCACHE -# -# Option: none. -# Description: check the instalation of the Ccache utility. -# -# ========================================================================= - - -# ========================================================================= -# AM_NEL_DEBUG - -AC_DEFUN([AM_NEL_DEBUG], -[ - -MAX_C_OPTIMIZE="-O6" - -STL_DEBUG="-D__STL_DEBUG" - -NL_DEBUG="-DNL_DEBUG" -NL_DEBUG_FAST="-DNL_DEBUG_FAST" -NL_RELEASE_DEBUG="-DNL_RELEASE_DEBUG" -NL_RELEASE="-DNL_RELEASE_DEBUG" - -AC_ARG_WITH(debug, - [ --with-debug[=full|medium|fast] - Build a debug version (huge libraries). - Full mode set only NeL and STL debug flags. - Medium mode set NeL debug flags with inline - optimization (default mode). - Fast mode is like the Medium mode with some basic - optimization. - --without-debug Build without debugging code (default)], - [with_debug=$withval], - [with_debug=no]) - -# Build optimized or debug version ? -# First check for gcc and g++ -if test "$ac_cv_prog_gcc" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" - OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" -else - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="" - OPTIMIZE_CFLAGS="" -fi - -if test "$ac_cv_prog_cxx_g" = "yes" -then - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="-O" - OPTIMIZE_CXXFLAGS="-O3" - OPTIMIZE_INLINE_CXXFLAGS="-finline-functions" -else - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="" - OPTIMIZE_INLINE_CXXFLAGS="" -fi - -if test "$with_debug" = "yes" -o "$with_debug" = "medium" -then - # Medium debug. Inline optimization - CFLAGS="$DEBUG_CFLAGS $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $NL_DEBUG_FAST $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $NL_DEBUG_FAST $CXXFLAGS" -else - if test "$with_debug" = "full" - then - # Full debug. Very slow in some cases - CFLAGS="$DEBUG_CFLAGS $NL_DEBUG $STL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $NL_DEBUG $STL_DEBUG $CXXFLAGS" - else - if test "$with_debug" = "fast" - then - # Fast debug. - CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS" - else - # Optimized version. No debug - CFLAGS="$OPTIMIZE_CFLAGS $NL_RELEASE_DEBUG $CFLAGS" - CXXFLAGS="$OPTIMIZE_CXXFLAGS $NL_RELEASE_DEBUG $CXXFLAGS" - fi - fi -fi - -# AC_MSG_RESULT([CFLAGS = $CFLAGS]) -# AC_MSG_RESULT([CXXGLAGS = $CXXFLAGS]) - -]) - - -# ========================================================================= -# MY_NEL_HEADER_CHK : NeL header files checking macros - -AC_DEFUN([MY_NEL_HEADER_CHK], -[ AC_REQUIRE_CPP() - -chk_message_obj="$1" -header="$2" -macro="$3" -is_mandatory="$4" - -if test $is_mandatory = "yes" -then - - _CPPFLAGS="$CPPFLAGS" - - CPPFLAGS="$CXXFLAGS $NEL_CFLAGS" - - AC_MSG_CHECKING(for $header) - - AC_EGREP_CPP( yo_header, -[#include <$header> -#ifdef $macro - yo_header -#endif], - have_header="yes", - have_header="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_header" = "yes" - then - AC_MSG_RESULT(yes) - else - if test "$is_mandatory" = "yes" - then - AC_MSG_ERROR([$chk_message_obj must be installed (http://www.nevrax.org).]) - else - AC_MSG_RESULT(no) - fi - fi -fi - - -]) - - -# ========================================================================= -# MY_NEL_LIB_CHK : NeL library checking macros - -AC_DEFUN([MY_NEL_LIB_CHK], -[ AC_REQUIRE_CPP() - -chk_message_obj="$1" -nel_test_lib="$2" -is_mandatory="$3" - -if test $is_mandatory = "yes" -then - - AC_CHECK_LIB($nel_test_lib, main,,[AC_MSG_ERROR([$chk_message_obj must be installed (http://www.nevrax.org).])]) -fi -]) - - -# ========================================================================= -# AM_PATH_NEL : NeL checking macros -AC_DEFUN([AM_PATH_NEL], -[ AC_REQUIRE_CPP() - -AC_ARG_WITH( nel, - [ --with-nel= path to the NeL install files directory. - e.g. /usr/local/nel]) - -AC_ARG_WITH( nel-include, - [ --with-nel-include= - path to the NeL header files directory. - e.g. /usr/local/nel/include]) - -AC_ARG_WITH( nel-lib, - [ --with-nel-lib= - path to the NeL library files directory. - e.g. /usr/local/nel/lib]) - - -nelmisc_is_mandatory="$1" -nelnet_is_mandatory="$2" -nel3d_is_mandatory="$3" -nelpacs_is_mandatory="$4" -nelsound_is_mandatory="$5" -nelai_is_mandatory="$6" -nelgeorges_is_mandatory="$7" - -# Check for nel-config -AC_PATH_PROG(NEL_CONFIG, nel-config, no) - -# -# Configure options (--with-nel*) have precendence -# over nel-config only set variables if they are not -# specified -# -if test "$NEL_CONFIG" != "no" -then - if test -z "$with_nel" -a -z "$with_nel_include" - then - CXXFLAGS="$CXXFLAGS `nel-config --cflags`" - fi - - if test -z "$with_nel" -a -z "$with_nel_lib" - then - LDFLAGS="`nel-config --ldflags` $LDFLAGS" - fi -fi - -# -# Set nel_libraries and nel_includes according to -# user specification (--with-nel*) if any. -# --with-nel-include and --with-nel-lib have precendence -# over --with-nel -# -if test "$with_nel" = "no" -then - # The user explicitly disabled the use of the NeL - AC_MSG_ERROR([NeL is mandatory: do not specify --without-nel]) -else - if test "$with_nel" -a "$with_nel" != "yes" - then - nel_includes="$with_nel/include" - nel_libraries="$with_nel/lib" - fi -fi - -if test "$with_nel_include" -then - nel_includes="$with_nel_include" -fi - -if test "$with_nel_lib" -then - nel_libraries="$with_nel_lib" -fi - -# -# Set compilation variables -# -if test "$nel_includes" -then - CXXFLAGS="$CXXFLAGS -I$nel_includes" -fi - -if test "$nel_libraries" -then - LDFLAGS="-L$nel_libraries $LDFLAGS" -fi - -# -# Collect headers information and bark if missing and -# mandatory -# - -MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory) -MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory) -MY_NEL_HEADER_CHK([NeL 3D], [nel/3d/u_camera.h], [NL_U_CAMERA_H], $nel3d_is_mandatory) -MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory) -MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory) -MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory) -MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory) - -# -# Collect libraries information and bark if missing and -# mandatory -# - -MY_NEL_LIB_CHK([NeL Misc], [nelmisc], $nelmisc_is_mandatory) -MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory) -MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory) -MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory) -MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory) -MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory) -MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory) - -]) - - -# ========================================================================= -# AM_PATH_STLPORT : STLPort checking macros - -AC_DEFUN([AM_PATH_STLPORT], -[ AC_REQUIRE_CPP() - -AC_ARG_WITH( stlport, - [ --with-stlport= path to the STLPort install files directory. - e.g. /usr/local/stlport]) - -AC_ARG_WITH( stlport-include, - [ --with-stlport-include= - path to the STLPort header files directory. - e.g. /usr/local/stlport/stlport]) - -AC_ARG_WITH( stlport-lib, - [ --with-stlport-lib= - path to the STLPort library files directory. - e.g. /usr/local/stlport/lib]) - -if test "$with_debug" = "full" -then - stlport_lib="stlport_gcc_debug" -else - stlport_lib="stlport_gcc" -fi - -if test "$with_debug" = "full" -then - stlport_lib2="stlport_gcc_debug" -else - stlport_lib2="stlport_gcc" -fi - -if test "$with_stlport" = no -then - # The user explicitly disabled the use of the STLPorts - AC_MSG_ERROR([STLPort is mandatory: do not specify --without-stlport]) -else - stlport_includes="/usr/include/stlport" - if test "$with_stlport" -a "$with_stlport" != yes - then - stlport_includes="$with_stlport/stlport" - stlport_libraries="$with_stlport/lib" - - if test ! -d "$stlport_includes" - then - stlport_includes="$with_stlport/include/stlport" - fi - fi -fi - -if test "$with_stlport_include" -then - stlport_includes="$with_stlport_include" -fi - -if test "$with_stlport_lib" -then - stlport_libraries="$with_stlport_lib" -fi - -# Check for the 'pthread' library. SLTPort needs it. -AC_CHECK_LIB(pthread, main, , [AC_MSG_ERROR([cannot find the pthread library.])]) -AC_CHECK_LIB(dl, dlopen, , [AC_MSG_ERROR([cannot find the dl library.])]) - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -# Put STLPorts includes in CXXFLAGS -if test "$stlport_includes" -then - CXXFLAGS="$CXXFLAGS -I$stlport_includes" -fi - -# Put STLPorts libraries directory in LIBS -if test "$stlport_libraries" -then - LIBS="-L$stlport_libraries $LIBS" -else - stlport_libraries='default' -fi - -# Put STLPort GCC libraries directory in LIBS -if test "$stlport_libraries2" -then - LIBS="-L$stlport_libraries2 $LIBS" -else - stlport_libraries2='default' -fi - -# Test the headers - -AC_CHECK_HEADER(algorithm, - have_stlport_headers="yes", - have_stlport_headers="no" ) - -AC_MSG_CHECKING(for STLPort headers) - -if test "$have_stlport_headers" = "yes" -then - AC_MSG_RESULT([$stlport_includes]) -else - AC_MSG_RESULT(no) -fi - -AC_CHECK_LIB($stlport_lib, main,, have_stlport_libraries="no") - -AC_MSG_CHECKING(for STLPort library) - -if test "$have_stlport_libraries" != "no" -then - AC_MSG_RESULT([$stlport_libraries]) -else - AC_MSG_RESULT(no) -fi - -AC_CHECK_LIB($stlport_lib2, main,, have_stlport_libraries="no") - -AC_MSG_CHECKING(for STLPort GCC library) - -if test "$have_stlport_libraries2" != "no" -then - AC_MSG_RESULT([$stlport_libraries2]) -else - AC_MSG_RESULT(no) -fi - -if test "$have_stlport_headers" = "yes" && - (test "$have_stlport_libraries" != "no" || test "$have_stlport_libraries2" != "no") -then - have_stlport="yes" -else - have_stlport="no" -fi - -if test "$have_stlport" = "no" -then - AC_MSG_ERROR([STLPort must be installed (http://www.stlport.org).]) -fi - -AC_LANG_RESTORE - -]) - - -# ========================================================================= -# AM_PATH_OPENGL : OpenGL checking macros - -AC_DEFUN([AM_PATH_OPENGL], -[ AC_MSG_CHECKING(for OpenGL headers and GL Version >= 1.2) - -is_mandatory="$1" - -AC_REQUIRE_CPP() - -AC_ARG_WITH( opengl, - [ --with-opengl= path to the OpenGL install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( opengl-include, - [ --with-opengl-include= - path to the OpenGL header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( opengl-lib, - [ --with-opengl-lib= - path to the OpenGL library files directory. - e.g. /usr/local/lib]) - -opengl_lib="GL" - -if test "$with_opengl" -then - opengl_includes="$with_opengl/include" - opengl_libraries="$with_opengl/lib" -fi - -if test "$with_opengl_include" -then - opengl_includes="$with_opengl_include" -fi - -if test "$with_opengl_lib" -then - opengl_libraries="$with_opengl_lib" -fi - -# Set OPENGL_CFLAGS -if test "$opengl_includes" -then - OPENGL_CFLAGS="-I$opengl_includes" -fi - -# Set OPENGL_LIBS -if test "$opengl_libraries" -then - OPENGL_LIBS="-L$opengl_libraries" -fi -OPENGL_LIBS="$OPENGL_LIBS -l$opengl_lib" - -# Test the headers -_CPPFLAGS="$CPPFLAGS" - -CPPFLAGS="$CXXFLAGS $OPENGL_CFLAGS" - -AC_EGREP_CPP( yo_opengl, -[#include -#if defined(GL_VERSION_1_2) - yo_opengl -#endif], - have_opengl_headers="yes", - have_opengl_headers="no" ) - -if test "$have_opengl_headers" = "yes" -then - if test "$opengl_includes" - then - AC_MSG_RESULT([$opengl_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Checking the GLEXT version >= 7 -AC_MSG_CHECKING(for and GLEXT version >= 7) - -AC_EGREP_CPP( yo_glext_version, -[#include -#ifdef GL_GLEXT_VERSION -#if GL_GLEXT_VERSION >= 7 - yo_glext_version -#endif -#endif], - have_glext="yes", - have_glext="no" ) - -if test "$have_glext" = "yes" -then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT([no, can be downloaded from http://oss.sgi.com/projects/ogl-sample/ABI/]) -fi - -# Test the libraries -AC_MSG_CHECKING(for OpenGL libraries) - -CPPFLAGS="$CXXFLAGS $OPENGL_LIBS" - -AC_TRY_LINK( , , have_opengl_libraries="yes", have_opengl_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_opengl_libraries" = "yes" -then - if test "$opengl_libraries" - then - AC_MSG_RESULT([$opengl_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -opengl_libraries="$opengl_libraries" - -if test "$have_opengl_headers" = "yes" \ - -a "$have_glext" = "yes" \ - -a "$have_opengl_libraries" = "yes" -then - have_opengl="yes" -else - have_opengl="no" -fi - -if test "$have_opengl" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([OpenGL >= 1.2 must be installed (http://www.mesa3d.org)]) -fi - -AC_SUBST(OPENGL_CFLAGS) -AC_SUBST(OPENGL_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_FREETYPE : FreeType checking macros - -AC_DEFUN([AM_PATH_FREETYPE], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -AC_ARG_WITH( freetype, - [ --with-freetype= path to the FreeType install files directory. - e.g. /usr/local/freetype]) - -AC_ARG_WITH( freetype-include, - [ --with-freetype-include= - path to the FreeType header files directory. - e.g. /usr/local/freetype/include]) - -AC_ARG_WITH( freetype-lib, - [ --with-freetype-lib= - path to the FreeType library files directory. - e.g. /usr/local/freetype/lib]) - -freetype_lib="freetype" - - -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) - -if test "$FREETYPE_CONFIG" = "no" -then - have_freetype_config="no" -else - FREETYPE_CFLAGS=`freetype-config --cflags` - FREETYPE_LIBS=`freetype-config --libs` - have_freetype_config="yes" -fi - -if test "$with_freetype" -then - freetype_includes="$with_freetype/include" - freetype_libraries="$with_freetype/lib" -fi - -if test "$with_freetype_include" -then - freetype_includes="$with_freetype_include" -fi - -if test "$with_freetype_lib" -then - freetype_libraries="$with_freetype_lib" -fi - -if test "$freetype_includes" -then - FREETYPE_CFLAGS="-I$freetype_includes" -fi - -# Checking the FreeType 2 instalation -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS" - -AC_MSG_CHECKING(for FreeType version = 2) - -AC_EGREP_CPP( yo_freetype2, -[#include -#if FREETYPE_MAJOR == 2 - yo_freetype2 -#endif], - have_freetype2="yes", - have_freetype2="no") - -if test "$have_freetype2" = "yes" -then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for FreeType libraries) - -if test $freetype_libraries -then - FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib" -fi - -CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS" - -AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_freetype_libraries" = "yes" -then - if test "$freetype_libraries" - then - AC_MSG_RESULT([$freetype_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -if test "$have_freetype2" = "yes" && test "$have_freetype_libraries" = "yes" -then - have_freetype="yes" -else - have_freetype="no" -fi - -if test "$have_freetype" = "no" && test "$is_mandatory" = "yes" -then - AC_MSG_ERROR([FreeType 2 must be installed (http://freetype.sourceforge.net)]) -fi - -AC_SUBST(FREETYPE_CFLAGS) -AC_SUBST(FREETYPE_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_XF86VIDMODE : XF86VidMode checking macros - -AC_DEFUN([AM_PATH_XF86VIDMODE], -[ AC_MSG_CHECKING(for XF86VidMode extension) - -AC_REQUIRE_CPP() - -AC_ARG_WITH( xf86vidmode-lib, - [ --with-xf86vidmode-lib= - path to the XF86VidMode library. - e.g. /usr/X11R6/lib] ) - -xf86vidmode_lib="Xxf86vm" - -if test "$with_xf86vidmode_lib" = no -then - # The user explicitly disabled the use of XF86VidMode - have_xf86vidmode="disabled" - AC_MSG_RESULT(disabled) -else - if test "$with_xf86vidmode_lib" - then - xf86vidmode_libraries="$with_xf86vidmode_lib" - fi - - XF86VIDMODE_CFLAGS="-DXF86VIDMODE" -fi - -if test -z "$have_xf86vidmode" -# -a "$with_xf86vidmode_lib" -then - if test "$xf86vidmode_libraries" - then - XF86VIDMODE_LIBS="-L$xf86vidmode_libraries" - fi - - XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS -l$xf86vidmode_lib" - - _CPPFLAGS="$CPPFLAGS" - - CPPFLAGS="$CXXFLAGS $XF86VIDMODE_LIBS" - - AC_TRY_LINK( , , have_xf86vidmode_libraries="yes", have_xf86vidmode_libraries="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_xf86vidmode_libraries" = "yes" - then - have_xf86vidmode="yes" - if test "$xf86vidmode_libraries" - then - AC_MSG_RESULT($xf86vidmode_libraries) - else - AC_MSG_RESULT(yes) - fi - else - have_xf86vidmode="no" - AC_MSG_RESULT(no, no fullscreen support available.) - fi - - xf86vidmode_libraries="$xf86vidmode_libraries" - -fi - -AC_SUBST(XF86VIDMODE_CFLAGS) -AC_SUBST(XF86VIDMODE_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_OPENAL : OpenAL checking macros - -AC_DEFUN([AM_PATH_OPENAL], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the OpenAL files location -AC_ARG_WITH( openal, - [ --with-openal= path to the OpenAL install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( openal-include, - [ --with-openal-include= - path to the OpenAL header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( openal-lib, - [ --with-openal-lib= - path to the OpenAL library files directory. - e.g. /usr/local/lib]) - -openal_lib="openal" - -if test $with_openal -then - openal_includes="$with_openal/include" - openal_libraries="$with_openal/lib" -fi - -if test "$with_openal_include" -then - openal_includes="$with_openal_include" -fi - -if test "$with_openal_lib" -then - openal_libraries="$with_openal_lib" -fi - - -# Set OPENAL_CFLAGS -if test "$openal_includes" -then - OPENAL_CFLAGS="-I$openal_includes" -fi - -# Set OPENAL_LIBS -if test "$openal_libraries" -then - OPENAL_LIBS="-L$openal_libraries" -fi -OPENAL_LIBS="$OPENAL_LIBS -l$openal_lib" - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS" - -AC_MSG_CHECKING(for OpenAL headers) -AC_EGREP_CPP( yo_openal, -[#include -#ifdef AL_VERSION - yo_openal -#endif], - have_openal_headers="yes", - have_openal_headers="no" ) - -if test "$have_openal_headers" = "yes" -then - if test "$openal_includes" - then - AC_MSG_RESULT([$openal_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for OpenAL libraries) - -CPPFLAGS="$CXXFLAGS $OPENAL_LIBS" - -AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_openal_libraries" = "yes" -then - if test "$openal_libraries" - then - AC_MSG_RESULT([$openal_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -openal_libraries="$openal_libraries" - -if test "$have_openal_headers" = "yes" \ - && test "$have_openal_libraries" = "yes" -then - have_openal="yes" -else - have_openal="no" -fi - -if test "$have_openal" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([OpenAL is needed to compile NeL (http://www.openal.org).]) -fi - -AC_SUBST(OPENAL_CFLAGS) -AC_SUBST(OPENAL_LIBS) - - -]) - - -# ========================================================================= -# AM_PATH_PYTHON : Python checking macros - -AC_DEFUN([AM_PATH_PYTHON], -[ python_version_required="$1" - -is_mandatory="$2" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the Python files location -AC_ARG_WITH( python, - [ --with-python= path to the Python prefix installation directory. - e.g. /usr/local], - [ PYTHON_PREFIX=$with_python ] -) - -AC_ARG_WITH( python-version, - [ --with-python-version= - Python version to use, e.g. 1.5], - [ PYTHON_VERSION=$with_python_version ] -) - -if test ! "$PYTHON_PREFIX" = "" -then - PATH="$PYTHON_PREFIX/bin:$PATH" -fi - -if test ! "$PYTHON_VERSION" = "" -then - PYTHON_EXEC="python$PYTHON_VERSION" -else - PYTHON_EXEC="python python2.1 python2.0 python1.5" -fi - -AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH) - -if test "$PYTHON" != "no" -then - PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'` - PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'` - - is_python_version_enough=`expr $python_version_required \<= $PYTHON_VERSION` -fi - - -if test "$PYTHON" = "no" || test "$is_python_version_enough" != "1" -then - - if test "$is_mandatory" = "yes" - then - AC_MSG_ERROR([Python $python_version_required must be installed (http://www.python.org)]) - else - have_python="no" - fi - -else - - python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION" - python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config" - python_lib="python$PYTHON_VERSION" - - PYTHON_CFLAGS="-I$python_includes" - PYTHON_LIBS="-L$python_libraries -l$python_lib" - - _CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CXXFLAGS ${PYTHON_CFLAGS}" - - # Test the headers - AC_MSG_CHECKING(for Python headers) - - AC_EGREP_CPP( yo_python, - [#include - yo_python - ], - have_python_headers="yes", - have_python_headers="no" ) - - if test "$have_python_headers" = "yes" - then - AC_MSG_RESULT([$python_includes]) - else - AC_MSG_RESULT(no) - fi - - # Test the libraries - AC_MSG_CHECKING(for Python libraries) - - CPPFLAGS="$CXXFLAGS $PYTHON_CFLAGS" - - AC_TRY_LINK( , , have_python_libraries="yes", have_python_libraries="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_python_libraries" = "yes" - then - if test "$python_libraries" - then - AC_MSG_RESULT([$python_libraries]) - else - AC_MSG_RESULT(yes) - fi - else - AC_MSG_RESULT(no) - fi - - if test "$have_python_headers" = "yes" \ - && test "$have_python_libraries" = "yes" - then - have_python="yes" - else - have_python="no" - fi - - if test "$have_python" = "no" -a "$is_mandatory" = "yes" - then - AC_MSG_ERROR([Python is needed to compile NeL (http://www.python.org).]) - fi - - AC_SUBST(PYTHON_CFLAGS) - AC_SUBST(PYTHON_LIBS) - -fi - -]) - - -# ========================================================================= -# AM_PATH_CCACHE : Ccache checking macros - -AC_DEFUN([AM_PATH_CCACHE], -[ - -AC_ARG_WITH( ccache, - [ --with-ccache use ccache for compiling.], - [ using_ccache=$with_ccache ] -) - -AC_PATH_PROG(CCACHE, ccache) -if test "$CCACHE" -a "$using_ccache" = "yes" -then - CC="ccache $CC" - CXX="ccache $CXX" -fi - -]) - -# ========================================================================= -# AM_PATH_MYSQL : MySQL library - -# AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -# Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS -# -AC_DEFUN([AM_PATH_MYSQL], -[# -# Get the cflags and libraries from the mysql_config script -# -AC_ARG_WITH(mysql-prefix,[ --with-mysql-prefix=PFX Prefix where MYSQL is installed (optional)], - mysql_prefix="$withval", mysql_prefix="") -AC_ARG_WITH(mysql-exec-prefix,[ --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)], - mysql_exec_prefix="$withval", mysql_exec_prefix="") -AC_ARG_ENABLE(mysqltest, [ --disable-mysqltest Do not try to compile and run a test MYSQL program], - , enable_mysqltest=yes) - - if test x$mysql_exec_prefix != x ; then - mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix" - if test x${MYSQL_CONFIG+set} != xset ; then - MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config - fi - fi - if test x$mysql_prefix != x ; then - mysql_args="$mysql_args --prefix=$mysql_prefix" - if test x${MYSQL_CONFIG+set} != xset ; then - MYSQL_CONFIG=$mysql_prefix/bin/mysql_config - fi - fi - - AC_REQUIRE([AC_CANONICAL_TARGET]) - AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no) - min_mysql_version=ifelse([$1], ,0.11.0,$1) - AC_MSG_CHECKING(for MYSQL - version >= $min_mysql_version) - no_mysql="" - if test "$MYSQL_CONFIG" = "no" ; then - no_mysql=yes - else - MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"` - MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"` - - mysql_major_version=`$MYSQL_CONFIG $mysql_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - mysql_minor_version=`$MYSQL_CONFIG $mysql_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - mysql_micro_version=`$MYSQL_CONFIG $mysql_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_mysqltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $MYSQL_CFLAGS" - LIBS="$LIBS $MYSQL_LIBS" -# -# Now check if the installed MYSQL is sufficiently new. (Also sanity -# checks the results of mysql_config to some extent -# - rm -f conf.mysqltest - AC_TRY_RUN([ -#include -#include -#include -#include - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.mysqltest"); - */ - { FILE *fp = fopen("conf.mysqltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_mysql_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_mysql_version"); - exit(1); - } - - if (($mysql_major_version > major) || - (($mysql_major_version == major) && ($mysql_minor_version > minor)) || - (($mysql_major_version == major) && ($mysql_minor_version == minor) && ($mysql_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'mysql_config --version' returned %d.%d.%d, but the minimum version\n", $mysql_major_version, $mysql_minor_version, $mysql_micro_version); - printf("*** of MYSQL required is %d.%d.%d. If mysql_config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If mysql_config was wrong, set the environment variable MYSQL_CONFIG\n"); - printf("*** to point to the correct copy of mysql_config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_mysql=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_mysql" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$MYSQL_CONFIG" = "no" ; then - echo "*** The mysql_config script installed by MYSQL could not be found" - echo "*** If MYSQL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the MYSQL_CONFIG environment variable to the" - echo "*** full path to mysql_config." - else - if test -f conf.mysqltest ; then - : - else - echo "*** Could not run MYSQL test program, checking why..." - CFLAGS="$CFLAGS $MYSQL_CFLAGS" - LIBS="$LIBS $MYSQL_LIBS" - AC_TRY_LINK([ -#include -#include - -int main(int argc, char *argv[]) -{ return 0; } -#undef main -#define main K_and_R_C_main -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding MYSQL or finding the wrong" - echo "*** version of MYSQL. If it is not finding MYSQL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means MYSQL was incorrectly installed" - echo "*** or that you have moved MYSQL since it was installed. In the latter case, you" - echo "*** may want to edit the mysql_config script: $MYSQL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - MYSQL_CFLAGS="" - MYSQL_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(MYSQL_CFLAGS) - AC_SUBST(MYSQL_LIBS) - rm -f conf.mysqltest -]) - -# ========================================================================= -# AM_PATH_FMOD : FMOD checking macros - -AC_DEFUN([AM_PATH_FMOD], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the FMOD files location -AC_ARG_WITH( fmod, - [ --with-fmod= path to the FMOD install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( fmod-include, - [ --with-fmod-include= - path to the FMOD header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( fmod-lib, - [ --with-fmod-lib= - path to the FMOD library files directory. - e.g. /usr/local/lib]) - -fmod_lib="fmod" - -if test $with_fmod -then - fmod_includes="$with_fmod/include" - fmod_libraries="$with_fmod/lib" -fi - -if test "$with_fmod_include" -then - fmod_includes="$with_fmod_include" -fi - -if test "$with_fmod_lib" -then - fmod_libraries="$with_fmod_lib" -fi - - -# Set FMOD_CFLAGS -if test "$fmod_includes" -then - FMOD_CFLAGS="-I$fmod_includes" -fi - -# Set FMOD_LIBS -if test "$fmod_libraries" -then - FMOD_LIBS="-L$fmod_libraries" -fi -FMOD_LIBS="$FMOD_LIBS -l$fmod_lib" - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS $FMOD_CFLAGS" - -AC_MSG_CHECKING(for FMOD headers) -AC_EGREP_CPP( yo_fmod, -[#include -#ifdef FMOD_VERSION - yo_fmod -#endif], - have_fmod_headers="yes", - have_fmod_headers="no" ) - -if test "$have_fmod_headers" = "yes" -then - if test "$fmod_includes" - then - AC_MSG_RESULT([$fmod_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for FMOD libraries) - -CPPFLAGS="$CXXFLAGS $FMOD_LIBS" - -AC_TRY_LINK( , , have_fmod_libraries="yes", have_fmod_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_fmod_libraries" = "yes" -then - if test "$fmod_libraries" - then - AC_MSG_RESULT([$fmod_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -fmod_libraries="$fmod_libraries" - -if test "$have_fmod_headers" = "yes" \ - && test "$have_fmod_libraries" = "yes" -then - have_fmod="yes" -else - have_fmod="no" -fi - -if test "$have_fmod" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([FMOD is needed to compile NeL (http://www.fmod.org).]) -fi - -AC_SUBST(FMOD_CFLAGS) -AC_SUBST(FMOD_LIBS) - -]) - -# ========================================================================= -# End of file - diff --git a/code/nel/Makefile.am b/code/nel/Makefile.am deleted file mode 100644 index f2af0b6d0..000000000 --- a/code/nel/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in \ - configure \ - libtool \ - config.guess \ - config.sub \ - ltconfig \ - aclocal.m4 \ - config.h.in \ - install-sh \ - missing \ - mkinstalldirs \ - ltmain.sh \ - include/nelconfig.h \ - include/nelconfig.h.in \ - include/nel/nelconfig.h - -DISTCLEANFILES = include/stamp-h \ - include/stamp-h.in - -SUBDIRS = include src @TOOLS_SUBDIR@ @SAMPLE_SUBDIR@ - -bin_SCRIPTS = nel-config - -EXTRA_DIST = nel.dsw \ - nel.sln \ - nel_8.sln \ - autogen.sh \ - nel.m4 \ - automacros \ - doc \ - kdevelop \ - tools \ - samples - -dist-hook: - find $(distdir) -name CVS -print | xargs rm -fr - find $(distdir) -name .svn -print | xargs rm -fr - -m4datadir = $(datadir)/aclocal -m4data_DATA = nel.m4 - -# End of Makefile.am - diff --git a/code/nel/acinclude.m4 b/code/nel/acinclude.m4 deleted file mode 100644 index 7a6655bff..000000000 --- a/code/nel/acinclude.m4 +++ /dev/null @@ -1,1214 +0,0 @@ -# ========================================================================= -# -# Macros used by Nevrax in configure.in files. -# -# -# ========================================================================= - -# ========================================================================= -# WARNING: The original version of this file is placed in the $CVSROOT/code -# directory. -# There is links in the $CVSROOT/code sub-directories to that file -# (ex: $CVSROOT/code/nel), so be careful of the consequences of -# any modification of that file. -# ========================================================================= - -# ========================================================================= -# Macros available in that file. -# -# -# AM_NEL_DEBUG -# -# Option: none. -# Description: manage the different debug and the release mode by setting -# correctly the CFLAGS and CXXFLAGS variables. -# -# -# AM_PATH_NEL -# -# Option: none. -# Description: check the instalation of the NeL library and set the -# CXXFLAGS and LIBS variables to use it. -# -# -# AM_PATH_OPENGL -# -# Option: "yes" if the use of the OpenGL library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# OPENGL_CFLAGS and OPENGL_LIBS variables to use it. -# -# -# AM_PATH_FREETYPE -# -# Option: "yes" if the use of the Freetype library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# FREETYPE_CFLAGS and FREETYPE_LIBS variables to use it. -# -# -# AM_PATH_XF86VIDMODE -# -# Option: none. -# Description: check the instalation of the OpenGL library and set the -# XF86VIDMODE_CFLAGS and XF86VIDMODE_LIBS variables to use it. -# -# -# AM_PATH_OPENAL -# -# Option: "yes" if the use of the OpenAL library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# OPENAL_CFLAGS and OPENAL_LIBS variables to use it. -# -# -# AM_PATH_PYTHON -# -# Option: "yes" if the use of the Python library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# PYTHON_CFLAGS and PYTHON_LIBS variables to use it. -# -# ========================================================================= - - -# ========================================================================= -# AM_NEL_DEBUG - -AC_DEFUN([AM_NEL_DEBUG], -[ - -MAX_C_OPTIMIZE="-O6" - -NL_DEBUG="-DNL_DEBUG" -NL_RELEASE="-DNL_RELEASE" - -AC_ARG_WITH(debug, - [ --with-debug[=full|medium|fast] - Build a debug version (huge libraries). - Full mode set no optimization. - Medium mode set NeL debug flags with inline - optimization (default mode). - Fast mode is like the Medium mode with some basic - optimization. - --without-debug Build without debugging code (default)], - [with_debug=$withval], - [with_debug=no]) - -# Build optimized or debug version ? -# First check for gcc and g++ -if test "$ac_cv_prog_gcc" = "yes" -then - DEBUG_CFLAGS="-g -O0" - DEBUG_OPTIMIZE_CC="-O" - OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" -else - DEBUG_CFLAGS="" - DEBUG_OPTIMIZE_CC="" - OPTIMIZE_CFLAGS="" -fi - -if test "$ac_cv_prog_cxx_g" = "yes" -then - DEBUG_CXXFLAGS="-g -O0" - DEBUG_OPTIMIZE_CXX="-O" - OPTIMIZE_CXXFLAGS="-O3" - OPTIMIZE_INLINE_CXXFLAGS="-finline-functions" -else - DEBUG_CXXFLAGS="" - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="" - OPTIMIZE_INLINE_CXXFLAGS="" -fi - -if test "$with_debug" = "yes" -o "$with_debug" = "medium" -then - # Medium debug. Inline optimization - CFLAGS="$DEBUG_CFLAGS $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS" -else - if test "$with_debug" = "full" - then - # Full debug. Very slow in some cases - CFLAGS="$DEBUG_CFLAGS $NL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $NL_DEBUG $CXXFLAGS" - else - if test "$with_debug" = "fast" - then - # Fast debug. - CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS" - else - # Optimized version. No debug - CFLAGS="$OPTIMIZE_CFLAGS $NL_RELEASE $CFLAGS" - CXXFLAGS="$OPTIMIZE_CXXFLAGS $NL_RELEASE $CXXFLAGS" - fi - fi -fi - -# AC_MSG_RESULT([CFLAGS = $CFLAGS]) -# AC_MSG_RESULT([CXXGLAGS = $CXXFLAGS]) - -]) - - -# ========================================================================= -# MY_NEL_HEADER_CHK : NeL header files checking macros - -AC_DEFUN([MY_NEL_HEADER_CHK], -[ AC_REQUIRE_CPP() - -chk_message_obj="$1" -header="$2" -macro="$3" -is_mandatory="$4" - -if test $is_mandatory = "yes" -then - - _CPPFLAGS="$CPPFLAGS" - - CPPFLAGS="$CXXFLAGS $NEL_CFLAGS" - - AC_MSG_CHECKING(for $header) - - AC_EGREP_CPP( yo_header, -[#include <$header> -#ifdef $macro - yo_header -#endif], - have_header="yes", - have_header="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_header" = "yes" - then - AC_MSG_RESULT(yes) - else - if test "$is_mandatory" = "yes" - then - AC_MSG_ERROR([$chk_message_obj must be installed (http://dev.ryzom.com).]) - else - AC_MSG_RESULT(no) - fi - fi -fi - - -]) - - -# ========================================================================= -# MY_NEL_LIB_CHK : NeL library checking macros - -AC_DEFUN([MY_NEL_LIB_CHK], -[ AC_REQUIRE_CPP() - -chk_message_obj="$1" -nel_test_lib="$2" -is_mandatory="$3" - -if test $is_mandatory = "yes" -then - - AC_CHECK_LIB($nel_test_lib, main,,[AC_MSG_ERROR([$chk_message_obj must be installed (http://dev.ryzom.com).])]) -fi -]) - - -# ========================================================================= -# AM_PATH_NEL : NeL checking macros -AC_DEFUN([AM_PATH_NEL], -[ AC_REQUIRE_CPP() - -AC_ARG_WITH( nel, - [ --with-nel= path to the NeL install files directory. - e.g. /usr/local/nel]) - -AC_ARG_WITH( nel-include, - [ --with-nel-include= - path to the NeL header files directory. - e.g. /usr/local/nel/include]) - -AC_ARG_WITH( nel-lib, - [ --with-nel-lib= - path to the NeL library files directory. - e.g. /usr/local/nel/lib]) - - -nelmisc_is_mandatory="$1" -nelnet_is_mandatory="$2" -nel3d_is_mandatory="$3" -nelpacs_is_mandatory="$4" -nelsound_is_mandatory="$5" -nelai_is_mandatory="$6" -nelgeorges_is_mandatory="$7" - -# Check for nel-config -AC_PATH_PROG(NEL_CONFIG, nel-config, no) - -# -# Configure options (--with-nel*) have precendence -# over nel-config only set variables if they are not -# specified -# -if test "$NEL_CONFIG" != "no" -then - if test -z "$with_nel" -a -z "$with_nel_include" - then - CXXFLAGS="$CXXFLAGS `nel-config --cflags`" - fi - - if test -z "$with_nel" -a -z "$with_nel_lib" - then - LDFLAGS="`nel-config --ldflags` $LDFLAGS" - fi -fi - -# -# Set nel_libraries and nel_includes according to -# user specification (--with-nel*) if any. -# --with-nel-include and --with-nel-lib have precendence -# over --with-nel -# -if test "$with_nel" = "no" -then - # The user explicitly disabled the use of the NeL - AC_MSG_ERROR([NeL is mandatory: do not specify --without-nel]) -else - if test "$with_nel" -a "$with_nel" != "yes" - then - nel_includes="$with_nel/include" - nel_libraries="$with_nel/lib" - fi -fi - -if test "$with_nel_include" -then - nel_includes="$with_nel_include" -fi - -if test "$with_nel_lib" -then - nel_libraries="$with_nel_lib" -fi - -# -# Set compilation variables -# -if test "$nel_includes" -then - CXXFLAGS="$CXXFLAGS -I$nel_includes" -fi - -if test "$nel_libraries" -then - LDFLAGS="-L$nel_libraries $LDFLAGS" -fi - -# -# Collect headers information and bark if missing and -# mandatory -# - -MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory) -MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory) -MY_NEL_HEADER_CHK([NeL 3D], [nel/3d/u_camera.h], [NL_U_CAMERA_H], $nel3d_is_mandatory) -MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory) -MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory) -MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory) -MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory) - -# -# Collect libraries information and bark if missing and -# mandatory -# - -MY_NEL_LIB_CHK([NeL Misc], [nelmisc], $nelmisc_is_mandatory) -MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory) -MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory) -MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory) -MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory) -MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory) -MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory) - -]) - -# ========================================================================= -# AM_PATH_OPENGL : OpenGL checking macros - -AC_DEFUN([AM_PATH_OPENGL], -[ AC_MSG_CHECKING(for OpenGL headers and GL Version >= 1.2) - -is_mandatory="$1" - -AC_REQUIRE_CPP() - -AC_ARG_WITH( opengl, - [ --with-opengl= path to the OpenGL install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( opengl-include, - [ --with-opengl-include= - path to the OpenGL header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( opengl-lib, - [ --with-opengl-lib= - path to the OpenGL library files directory. - e.g. /usr/local/lib]) - -opengl_lib="GL" - -if test "$with_opengl" -then - opengl_includes="$with_opengl/include" - opengl_libraries="$with_opengl/lib" -fi - -if test "$with_opengl_include" -then - opengl_includes="$with_opengl_include" -fi - -if test "$with_opengl_lib" -then - opengl_libraries="$with_opengl_lib" -fi - -# Set OPENGL_CFLAGS -if test "$opengl_includes" -then - OPENGL_CFLAGS="-I$opengl_includes" -fi - -# Set OPENGL_LIBS -if test "$opengl_libraries" -then - OPENGL_LIBS="-L$opengl_libraries" -fi -OPENGL_LIBS="$OPENGL_LIBS -l$opengl_lib" - -# Test the headers -_CPPFLAGS="$CPPFLAGS" - -CPPFLAGS="$CXXFLAGS $OPENGL_CFLAGS" - -AC_EGREP_CPP( yo_opengl, -[#include -#if defined(GL_VERSION_1_2) - yo_opengl -#endif], - have_opengl_headers="yes", - have_opengl_headers="no" ) - -if test "$have_opengl_headers" = "yes" -then - if test "$opengl_includes" - then - AC_MSG_RESULT([$opengl_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Checking the GLEXT version >= 7 -AC_MSG_CHECKING(for and GLEXT version >= 7) - -AC_EGREP_CPP( yo_glext_version, -[#include -#ifdef GL_GLEXT_VERSION -#if GL_GLEXT_VERSION >= 7 - yo_glext_version -#endif -#endif], - have_glext="yes", - have_glext="no" ) - -if test "$have_glext" = "yes" -then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT([no, can be downloaded from http://www.opengl.org/registry/]) -fi - -# Test the libraries -AC_MSG_CHECKING(for OpenGL libraries) - -CPPFLAGS="$CXXFLAGS $OPENGL_LIBS" - -AC_TRY_LINK( , , have_opengl_libraries="yes", have_opengl_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_opengl_libraries" = "yes" -then - if test "$opengl_libraries" - then - AC_MSG_RESULT([$opengl_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -opengl_libraries="$opengl_libraries" - -if test "$have_opengl_headers" = "yes" \ - -a "$have_glext" = "yes" \ - -a "$have_opengl_libraries" = "yes" -then - have_opengl="yes" -else - have_opengl="no" -fi - -if test "$have_opengl" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([OpenGL >= 1.2 must be installed (http://www.mesa3d.org)]) -fi - -AC_SUBST(OPENGL_CFLAGS) -AC_SUBST(OPENGL_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_FREETYPE : FreeType checking macros - -AC_DEFUN([AM_PATH_FREETYPE], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -AC_ARG_WITH( freetype, - [ --with-freetype= path to the FreeType install files directory. - e.g. /usr/local/freetype]) - -AC_ARG_WITH( freetype-include, - [ --with-freetype-include= - path to the FreeType header files directory. - e.g. /usr/local/freetype/include]) - -AC_ARG_WITH( freetype-lib, - [ --with-freetype-lib= - path to the FreeType library files directory. - e.g. /usr/local/freetype/lib]) - -freetype_lib="freetype" - - -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) - -if test "$FREETYPE_CONFIG" = "no" -then - have_freetype_config="no" -else - FREETYPE_CFLAGS=`freetype-config --cflags` - FREETYPE_LIBS=`freetype-config --libs` - have_freetype_config="yes" -fi - -if test "$with_freetype" -then - freetype_includes="$with_freetype/include" - freetype_libraries="$with_freetype/lib" -fi - -if test "$with_freetype_include" -then - freetype_includes="$with_freetype_include" -fi - -if test "$with_freetype_lib" -then - freetype_libraries="$with_freetype_lib" -fi - -if test "$freetype_includes" -then - FREETYPE_CFLAGS="-I$freetype_includes" -fi - -# Checking the FreeType 2 instalation -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS" - -AC_MSG_CHECKING(for FreeType version = 2) - -AC_EGREP_CPP( yo_freetype2, -[#include -#if FREETYPE_MAJOR == 2 - yo_freetype2 -#endif], - have_freetype2="yes", - have_freetype2="no") - -if test "$have_freetype2" = "yes" -then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for FreeType libraries) - -if test $freetype_libraries -then - FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib" -fi - -CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS" - -AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_freetype_libraries" = "yes" -then - if test "$freetype_libraries" - then - AC_MSG_RESULT([$freetype_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -if test "$have_freetype2" = "yes" && test "$have_freetype_libraries" = "yes" -then - have_freetype="yes" -else - have_freetype="no" -fi - -if test "$have_freetype" = "no" && test "$is_mandatory" = "yes" -then - AC_MSG_ERROR([FreeType 2 must be installed (http://freetype.sourceforge.net)]) -fi - -AC_SUBST(FREETYPE_CFLAGS) -AC_SUBST(FREETYPE_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_XF86VIDMODE : XF86VidMode checking macros - -AC_DEFUN([AM_PATH_XF86VIDMODE], -[ AC_MSG_CHECKING(for XF86VidMode extension) - -AC_REQUIRE_CPP() - -AC_ARG_WITH( xf86vidmode-lib, - [ --with-xf86vidmode-lib= - path to the XF86VidMode library. - e.g. /usr/X11R6/lib] ) - -xf86vidmode_lib="Xxf86vm" - -if test "$with_xf86vidmode_lib" = no -then - # The user explicitly disabled the use of XF86VidMode - have_xf86vidmode="disabled" - AC_MSG_RESULT(disabled) -else - if test "$with_xf86vidmode_lib" - then - xf86vidmode_libraries="$with_xf86vidmode_lib" - fi - - XF86VIDMODE_CFLAGS="-DXF86VIDMODE" -fi - -if test -z "$have_xf86vidmode" -# -a "$with_xf86vidmode_lib" -then - if test "$xf86vidmode_libraries" - then - XF86VIDMODE_LIBS="-L$xf86vidmode_libraries" - fi - - XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS -l$xf86vidmode_lib" - - _CPPFLAGS="$CPPFLAGS" - - CPPFLAGS="$CXXFLAGS $XF86VIDMODE_LIBS" - - AC_TRY_LINK( , , have_xf86vidmode_libraries="yes", have_xf86vidmode_libraries="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_xf86vidmode_libraries" = "yes" - then - have_xf86vidmode="yes" - if test "$xf86vidmode_libraries" - then - AC_MSG_RESULT($xf86vidmode_libraries) - else - AC_MSG_RESULT(yes) - fi - else - have_xf86vidmode="no" - AC_MSG_RESULT(no, no fullscreen support available.) - fi - - xf86vidmode_libraries="$xf86vidmode_libraries" - -fi - -AC_SUBST(XF86VIDMODE_CFLAGS) -AC_SUBST(XF86VIDMODE_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_OPENAL : OpenAL checking macros - -AC_DEFUN([AM_PATH_OPENAL], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the OpenAL files location -AC_ARG_WITH( openal, - [ --with-openal= path to the OpenAL install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( openal-include, - [ --with-openal-include= - path to the OpenAL header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( openal-lib, - [ --with-openal-lib= - path to the OpenAL library files directory. - e.g. /usr/local/lib]) - -openal_lib="openal" -alut_lib="alut" - -if test $with_openal -then - openal_includes="$with_openal/include" - openal_libraries="$with_openal/lib" -fi - -if test "$with_openal_include" -then - openal_includes="$with_openal_include" -fi - -if test "$with_openal_lib" -then - openal_libraries="$with_openal_lib" -fi - - -# Set OPENAL_CFLAGS -if test "$openal_includes" -then - OPENAL_CFLAGS="-I$openal_includes" -fi - -# Set OPENAL_LIBS -if test "$openal_libraries" -then - OPENAL_LIBS="-L$openal_libraries" -fi -OPENAL_LIBS="$OPENAL_LIBS -l$openal_lib -l$alut_lib" - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS" - -AC_MSG_CHECKING(for OpenAL headers) -AC_EGREP_CPP( yo_openal, -[#include -#include -#ifdef AL_VERSION - yo_openal -#endif], - have_openal_headers="yes", - have_openal_headers="no" ) - -if test "$have_openal_headers" = "yes" -then - if test "$openal_includes" - then - AC_MSG_RESULT([$openal_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for OpenAL libraries) - -CPPFLAGS="$CXXFLAGS $OPENAL_LIBS" - -AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_openal_libraries" = "yes" -then - if test "$openal_libraries" - then - AC_MSG_RESULT([$openal_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -openal_libraries="$openal_libraries" - -if test "$have_openal_headers" = "yes" \ - && test "$have_openal_libraries" = "yes" -then - have_openal="yes" -else - have_openal="no" -fi - -if test "$have_openal" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([OpenAL is needed to compile NeL (http://www.openal.org).]) -fi - -AC_SUBST(OPENAL_CFLAGS) -AC_SUBST(OPENAL_LIBS) -AC_SUBST([have_openal]) - -]) - - -# ========================================================================= -# AM_PATH_PYTHON : Python checking macros - -AC_DEFUN([AM_PATH_PYTHON], -[ python_version_required="$1" - -is_mandatory="$2" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the Python files location -AC_ARG_WITH( python, - [ --with-python= path to the Python prefix installation directory. - e.g. /usr/local], - [ PYTHON_PREFIX=$with_python ] -) - -AC_ARG_WITH( python-version, - [ --with-python-version= - Python version to use, e.g. 1.5], - [ PYTHON_VERSION=$with_python_version ] -) - -if test ! "$PYTHON_PREFIX" = "" -then - PATH="$PYTHON_PREFIX/bin:$PATH" -fi - -if test ! "$PYTHON_VERSION" = "" -then - PYTHON_EXEC="python$PYTHON_VERSION" -else - PYTHON_EXEC="python python2.1 python2.0 python1.5" -fi - -AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH) - -if test "$PYTHON" != "no" -then - PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'` - PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'` - - is_python_version_enough=`expr $python_version_required \<= $PYTHON_VERSION` -fi - - -if test "$PYTHON" = "no" || test "$is_python_version_enough" != "1" -then - - if test "$is_mandatory" = "yes" - then - AC_MSG_ERROR([Python $python_version_required must be installed (http://www.python.org)]) - else - have_python="no" - fi - -else - - python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION" - python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config" - python_lib="python$PYTHON_VERSION" - - PYTHON_CFLAGS="-I$python_includes" - PYTHON_LIBS="-L$python_libraries -l$python_lib" - - _CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CXXFLAGS ${PYTHON_CFLAGS}" - - # Test the headers - AC_MSG_CHECKING(for Python headers) - - AC_EGREP_CPP( yo_python, - [#include - yo_python - ], - have_python_headers="yes", - have_python_headers="no" ) - - if test "$have_python_headers" = "yes" - then - AC_MSG_RESULT([$python_includes]) - else - AC_MSG_RESULT(no) - fi - - # Test the libraries - AC_MSG_CHECKING(for Python libraries) - - CPPFLAGS="$CXXFLAGS $PYTHON_CFLAGS" - - AC_TRY_LINK( , , have_python_libraries="yes", have_python_libraries="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_python_libraries" = "yes" - then - if test "$python_libraries" - then - AC_MSG_RESULT([$python_libraries]) - else - AC_MSG_RESULT(yes) - fi - else - AC_MSG_RESULT(no) - fi - - if test "$have_python_headers" = "yes" \ - && test "$have_python_libraries" = "yes" - then - have_python="yes" - else - have_python="no" - fi - - if test "$have_python" = "no" -a "$is_mandatory" = "yes" - then - AC_MSG_ERROR([Python is needed to compile NeL (http://www.python.org).]) - fi - - AC_SUBST(PYTHON_CFLAGS) - AC_SUBST(PYTHON_LIBS) - -fi - -]) - -# ========================================================================= -# AM_PATH_MYSQL : MySQL library - -# AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -# Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS -# -AC_DEFUN([AM_PATH_MYSQL], -[# -# Get the cflags and libraries from the mysql_config script -# -AC_ARG_WITH(mysql-prefix,[ --with-mysql-prefix=PFX Prefix where MYSQL is installed (optional)], - mysql_prefix="$withval", mysql_prefix="") -AC_ARG_WITH(mysql-exec-prefix,[ --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)], - mysql_exec_prefix="$withval", mysql_exec_prefix="") -AC_ARG_ENABLE(mysqltest, [ --disable-mysqltest Do not try to compile and run a test MYSQL program], - , enable_mysqltest=yes) - - if test x$mysql_exec_prefix != x ; then - mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix" - if test x${MYSQL_CONFIG+set} != xset ; then - MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config - fi - fi - if test x$mysql_prefix != x ; then - mysql_args="$mysql_args --prefix=$mysql_prefix" - if test x${MYSQL_CONFIG+set} != xset ; then - MYSQL_CONFIG=$mysql_prefix/bin/mysql_config - fi - fi - - AC_REQUIRE([AC_CANONICAL_TARGET]) - AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no) - min_mysql_version=ifelse([$1], ,0.11.0,$1) - AC_MSG_CHECKING(for MYSQL - version >= $min_mysql_version) - no_mysql="" - if test "$MYSQL_CONFIG" = "no" ; then - no_mysql=yes - else - MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"` - MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"` - - mysql_major_version=`$MYSQL_CONFIG $mysql_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - mysql_minor_version=`$MYSQL_CONFIG $mysql_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - mysql_micro_version=`$MYSQL_CONFIG $mysql_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_mysqltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $MYSQL_CFLAGS" - LIBS="$LIBS $MYSQL_LIBS" -# -# Now check if the installed MYSQL is sufficiently new. (Also sanity -# checks the results of mysql_config to some extent -# - rm -f conf.mysqltest - AC_TRY_RUN([ -#include -#include -#include -#include - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.mysqltest"); - */ - { FILE *fp = fopen("conf.mysqltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_mysql_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_mysql_version"); - exit(1); - } - - if (($mysql_major_version > major) || - (($mysql_major_version == major) && ($mysql_minor_version > minor)) || - (($mysql_major_version == major) && ($mysql_minor_version == minor) && ($mysql_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'mysql_config --version' returned %d.%d.%d, but the minimum version\n", $mysql_major_version, $mysql_minor_version, $mysql_micro_version); - printf("*** of MYSQL required is %d.%d.%d. If mysql_config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If mysql_config was wrong, set the environment variable MYSQL_CONFIG\n"); - printf("*** to point to the correct copy of mysql_config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_mysql=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_mysql" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$MYSQL_CONFIG" = "no" ; then - echo "*** The mysql_config script installed by MYSQL could not be found" - echo "*** If MYSQL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the MYSQL_CONFIG environment variable to the" - echo "*** full path to mysql_config." - else - if test -f conf.mysqltest ; then - : - else - echo "*** Could not run MYSQL test program, checking why..." - CFLAGS="$CFLAGS $MYSQL_CFLAGS" - LIBS="$LIBS $MYSQL_LIBS" - AC_TRY_LINK([ -#include -#include - -int main(int argc, char *argv[]) -{ return 0; } -#undef main -#define main K_and_R_C_main -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding MYSQL or finding the wrong" - echo "*** version of MYSQL. If it is not finding MYSQL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means MYSQL was incorrectly installed" - echo "*** or that you have moved MYSQL since it was installed. In the latter case, you" - echo "*** may want to edit the mysql_config script: $MYSQL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - MYSQL_CFLAGS="" - MYSQL_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(MYSQL_CFLAGS) - AC_SUBST(MYSQL_LIBS) - rm -f conf.mysqltest -]) - -# ========================================================================= -# AM_PATH_FMOD : FMOD checking macros - -AC_DEFUN([AM_PATH_FMOD], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the FMOD files location -AC_ARG_WITH( fmod, - [ --with-fmod= path to the FMOD install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( fmod-include, - [ --with-fmod-include= - path to the FMOD header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( fmod-lib, - [ --with-fmod-lib= - path to the FMOD library files directory. - e.g. /usr/local/lib]) - -fmod_lib="fmod" - -if test $with_fmod -then - fmod_includes="$with_fmod/include" - fmod_libraries="$with_fmod/lib" -fi - -if test "$with_fmod_include" -then - fmod_includes="$with_fmod_include" -fi - -if test "$with_fmod_lib" -then - fmod_libraries="$with_fmod_lib" -fi - - -# Set FMOD_CFLAGS -if test "$fmod_includes" -then - FMOD_CFLAGS="-I$fmod_includes" -fi - -# Set FMOD_LIBS -if test "$fmod_libraries" -then - FMOD_LIBS="-L$fmod_libraries" -fi -FMOD_LIBS="$FMOD_LIBS -l$fmod_lib" - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS $FMOD_CFLAGS" - -AC_MSG_CHECKING(for FMOD headers) -AC_EGREP_CPP( yo_fmod, -[#include -#ifdef FMOD_VERSION - yo_fmod -#endif], - have_fmod_headers="yes", - have_fmod_headers="no" ) - -if test "$have_fmod_headers" = "yes" -then - if test "$fmod_includes" - then - AC_MSG_RESULT([$fmod_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for FMOD libraries) - -CPPFLAGS="$CXXFLAGS $FMOD_LIBS" - -AC_TRY_LINK( , , have_fmod_libraries="yes", have_fmod_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_fmod_libraries" = "yes" -then - if test "$fmod_libraries" - then - AC_MSG_RESULT([$fmod_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -fmod_libraries="$fmod_libraries" - -if test "$have_fmod_headers" = "yes" \ - && test "$have_fmod_libraries" = "yes" -then - have_fmod="yes" -else - have_fmod="no" -fi - -if test "$have_fmod" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([FMOD is needed to compile NeL (http://www.fmod.org).]) -fi - -AC_SUBST(FMOD_CFLAGS) -AC_SUBST(FMOD_LIBS) -AC_SUBST([have_fmod]) - -]) - -# ========================================================================= -# End of file - diff --git a/code/nel/autogen.sh b/code/nel/autogen.sh deleted file mode 100755 index b863e1067..000000000 --- a/code/nel/autogen.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - - -WANT_AUTOMAKE="1.6" - -case `uname -s` in -Darwin) - LIBTOOLIZE=glibtoolize - ;; -*) - LIBTOOLIZE=libtoolize - ;; -esac - -# be able to customize the aclocal (for example to add extra param) -if test "x$ACLOCAL" = "x" -then - ACLOCAL=aclocal -fi - -echo "Creating macros..." && \ -$ACLOCAL -I automacros/ && \ -echo "Creating library tools..." && \ -$LIBTOOLIZE --force && \ -echo "Creating header templates..." && \ -autoheader && \ -echo "Creating Makefile templates..." && \ -automake --gnu --add-missing && \ -echo "Creating 'configure'..." && \ -autoconf && \ -echo "" && \ -echo "Run: ./configure; make; make install" && \ -echo "" diff --git a/code/nel/automacros/gtk-2.0.m4 b/code/nel/automacros/gtk-2.0.m4 deleted file mode 100644 index 3deba01be..000000000 --- a/code/nel/automacros/gtk-2.0.m4 +++ /dev/null @@ -1,196 +0,0 @@ -# Configure paths for GTK+ -# Owen Taylor 1997-2001 - -dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -dnl pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GTK_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], - , enable_gtktest=yes) - - pkg_config_args=gtk+-2.0 - for module in . $4 - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - no_gtk="" - - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - if test x$PKG_CONFIG != xno ; then - if pkg-config --atleast-pkgconfig-version 0.7 ; then - : - else - echo "*** pkg-config too old; version 0.7 or better required." - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes - fi - - min_gtk_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi - - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk=yes - fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) diff --git a/code/nel/automacros/ogg.m4 b/code/nel/automacros/ogg.m4 deleted file mode 100644 index 0e1f1abf5..000000000 --- a/code/nel/automacros/ogg.m4 +++ /dev/null @@ -1,102 +0,0 @@ -# Configure paths for libogg -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh - -dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS -dnl -AC_DEFUN([XIPH_PATH_OGG], -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") -AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="") -AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="") -AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) - - if test "x$ogg_libraries" != "x" ; then - OGG_LIBS="-L$ogg_libraries" - elif test "x$ogg_prefix" != "x" ; then - OGG_LIBS="-L$ogg_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - OGG_LIBS="-L$prefix/lib" - fi - - OGG_LIBS="$OGG_LIBS -logg" - - if test "x$ogg_includes" != "x" ; then - OGG_CFLAGS="-I$ogg_includes" - elif test "x$ogg_prefix" != "x" ; then - OGG_CFLAGS="-I$ogg_prefix/include" - elif test "x$prefix" != "xNONE"; then - OGG_CFLAGS="-I$prefix/include" - fi - - AC_MSG_CHECKING(for Ogg) - no_ogg="" - - - if test "x$enable_oggtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Ogg is sufficiently new. -dnl - rm -f conf.oggtest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.oggtest"); - return 0; -} - -],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_ogg" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.oggtest ; then - : - else - echo "*** Could not run Ogg test program, checking why..." - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Ogg or finding the wrong" - echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Ogg was incorrectly installed" - echo "*** or that you have moved Ogg since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - OGG_CFLAGS="" - OGG_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(OGG_CFLAGS) - AC_SUBST(OGG_LIBS) - rm -f conf.oggtest -]) diff --git a/code/nel/automacros/pkg.m4 b/code/nel/automacros/pkg.m4 deleted file mode 100644 index c29b6c057..000000000 --- a/code/nel/automacros/pkg.m4 +++ /dev/null @@ -1,157 +0,0 @@ -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright Š 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES diff --git a/code/nel/automacros/vorbis.m4 b/code/nel/automacros/vorbis.m4 deleted file mode 100644 index 300cc6c7d..000000000 --- a/code/nel/automacros/vorbis.m4 +++ /dev/null @@ -1,122 +0,0 @@ -# Configure paths for libvorbis -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh -# thomasvs added check for vorbis_bitrate_addblock which is new in rc3 - -dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS -dnl -AC_DEFUN([XIPH_PATH_VORBIS], -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(vorbis,[ --with-vorbis=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="") -AC_ARG_WITH(vorbis-libraries,[ --with-vorbis-libraries=DIR Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="") -AC_ARG_WITH(vorbis-includes,[ --with-vorbis-includes=DIR Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="") -AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes) - - if test "x$vorbis_libraries" != "x" ; then - VORBIS_LIBS="-L$vorbis_libraries" - elif test "x$vorbis_prefix" != "x" ; then - VORBIS_LIBS="-L$vorbis_prefix/lib" - elif test "x$prefix" != "xNONE"; then - VORBIS_LIBS="-L$prefix/lib" - fi - - VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" - VORBISFILE_LIBS="-lvorbisfile" - VORBISENC_LIBS="-lvorbisenc" - - if test "x$vorbis_includes" != "x" ; then - VORBIS_CFLAGS="-I$vorbis_includes" - elif test "x$vorbis_prefix" != "x" ; then - VORBIS_CFLAGS="-I$vorbis_prefix/include" - elif test "x$prefix" != "xNONE"; then - VORBIS_CFLAGS="-I$prefix/include" - fi - - - AC_MSG_CHECKING(for Vorbis) - no_vorbis="" - - - if test "x$enable_vorbistest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Vorbis is sufficiently new. -dnl - rm -f conf.vorbistest - AC_TRY_RUN([ -#include -#include -#include -#include -#include - -int main () -{ - vorbis_block vb; - vorbis_dsp_state vd; - vorbis_info vi; - - vorbis_info_init (&vi); - vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1); - vorbis_analysis_init (&vd, &vi); - vorbis_block_init (&vd, &vb); - /* this function was added in 1.0rc3, so this is what we're testing for */ - vorbis_bitrate_addblock (&vb); - - system("touch conf.vorbistest"); - return 0; -} - -],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_vorbis" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.vorbistest ; then - : - else - echo "*** Could not run Vorbis test program, checking why..." - CFLAGS="$CFLAGS $VORBIS_CFLAGS" - LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Vorbis or finding the wrong" - echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Vorbis was incorrectly installed" - echo "*** or that you have moved Vorbis since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - VORBIS_CFLAGS="" - VORBIS_LIBS="" - VORBISFILE_LIBS="" - VORBISENC_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(VORBIS_CFLAGS) - AC_SUBST(VORBIS_LIBS) - AC_SUBST(VORBISFILE_LIBS) - AC_SUBST(VORBISENC_LIBS) - rm -f conf.vorbistest -]) diff --git a/code/nel/configure.ac b/code/nel/configure.ac deleted file mode 100644 index 84edccc05..000000000 --- a/code/nel/configure.ac +++ /dev/null @@ -1,599 +0,0 @@ -# ==================================================================== -# Configuration script for NeL -# ==================================================================== -# -# $Id: configure.ac,v 1.8 2005/04/14 15:54:32 cado Exp $ -# - -# ==================================================================== -# Process this file with autoconf to produce a configure script. -# ==================================================================== - -# If you want to change the version, must must change AC_INIT -# *and* AC_SUBST(LIBTOOL_VERSION) - -AC_PREREQ(2.57) -AC_INIT([nel],[0.8.0],[nel-all@nevrax.org]) -AM_INIT_AUTOMAKE([tar-ustar]) - -AC_CONFIG_SRCDIR(include/nel/misc/types_nl.h) -AM_CONFIG_HEADER(include/nelconfig.h) - -AC_SUBST(LIBTOOL_VERSION, [0:7:0]) - -# Checks for programs. -AC_CANONICAL_HOST -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_YACC -AC_PROG_LEX -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_LIBTOOL -AM_PROG_LIBTOOL -AM_SANITY_CHECK - -AC_SYS_LARGEFILE - -AM_MAINTAINER_MODE - - -# Template needed to generate the nelconfig.h.in -AH_TEMPLATE([NEL_DEFAULT_DISPLAYER],[Define to 1 if you want log on standard output]) -AH_TEMPLATE([NEL_LOG_IN_FILE],[Define to 1 if you want a debug log.log file in the current directory]) -AH_TEMPLATE([HAVE_X86],[Define to 1 if you are on a INTEL compatible processor]) -AH_TEMPLATE([HAVE_X86_64],[Define to 1 if you are on AMD opteron 64bits processor]) -AH_TEMPLATE([NL_USE_GTK], [Define to 1 if you want GTK support]) - -# Get host type info -if test "$host_cpu" = "i386" -o "$host_cpu" = "i486" -o "$host_cpu" = "i586" \ - -o "$host_cpu" = "i686" -o "$host_cpu" = "i786" -o "$host_cpu" = "x86_64" -then - AC_DEFINE([HAVE_X86]) -fi - -if test "$host_cpu" = "x86_64" -then - AC_DEFINE([HAVE_X86_64]) -fi - -# The following hack should ensure that configure doesnt add optimizing -# or debugging flags to CFLAGS or CXXFLAGS -CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -ftemplate-depth-24 -fno-stack-protector" - - -# ==================================================================== -# Checks NeL modules (net, 3d) to install / Disable -# ==================================================================== - -# The misc is mandatory, it is use by the other modules. - -NEL_SUBDIRS="misc" - -# NeL libraries that are enabled by default - -# Network library -AC_ARG_ENABLE([net], - AC_HELP_STRING([--disable-net], - [disable compilation and install of NeL Network]), - [], - [enable_net=yes]) - -if test "$enable_net" = "no" -then - AC_MSG_RESULT([disable NeL Network]) -else - NEL_SUBDIRS="$NEL_SUBDIRS net" -fi - -# 3D library -AC_ARG_ENABLE([3d], - AC_HELP_STRING([--disable-3d], - [disable compilation and install of NeL 3D]), - [], - [enable_3d=yes]) - -if test "$enable_3d" = "no" -then - AC_MSG_RESULT([disable NeL 3D]) -else - NEL_SUBDIRS="$NEL_SUBDIRS 3d" -fi - -# PACS library -AC_ARG_ENABLE([pacs], - AC_HELP_STRING([--disable-pacs], - [disable compilation and install of NeL PACS]), - [], - [enable_pacs=yes]) - -if test "$enable_pacs" = "no" -then - AC_MSG_RESULT([disable NeL PACS]) -else - NEL_SUBDIRS="$NEL_SUBDIRS pacs" -fi - -# Georges library -AC_ARG_ENABLE([georges], - AC_HELP_STRING([--disable-georges], - [disable compilation and install of NeL Georges]), - [], - [enable_georges=yes]) - -if test "$enable_georges" = "no" -then - AC_MSG_RESULT([disable NeL Georges]) -else - NEL_SUBDIRS="$NEL_SUBDIRS georges" -fi - -# Ligo library -AC_ARG_ENABLE([ligo], - AC_HELP_STRING([--disable-ligo], - [disable compilation and install of NeL Ligo]), - [], - [enable_ligo=yes]) - -if test "$enable_ligo" = "no" -then - AC_MSG_RESULT([disable NeL Ligo]) -else - NEL_SUBDIRS="$NEL_SUBDIRS ligo" -fi - - -# NeL libraries that are disabled by default - -# Sound library -AC_ARG_ENABLE([sound], - AC_HELP_STRING([--enable-sound], - [enable compilation and install of NeL Sound]), - [], - [enable_sound=no]) - -if test "$enable_sound" = "yes" -then - AC_MSG_RESULT([enable NeL Sound]) - NEL_SUBDIRS="$NEL_SUBDIRS sound" -fi - -# CEGUI Renderer library -AC_ARG_ENABLE([cegui], - AC_HELP_STRING([--enable-cegui], - [enable compilation and install of NeL CEGUI Renderer]), - [], - [enable_cegui=no]) - -CEGUI_SUBDIR="" -if test "$enable_cegui" = "yes" -then - AC_MSG_RESULT([enable NeL CEGUI Renderer]) - NEL_SUBDIRS="$NEL_SUBDIRS cegui" - CEGUI_SUBDIR="cegui" -fi - -# Unit Tests -AC_ARG_ENABLE([tests], - AC_HELP_STRING([--enable-tests], - [enable unit tests of NeL]), - [], - [enable_tests=no]) - -if test "$enable_tests" = "yes" -then - AC_MSG_RESULT([enable NeL Unit Tests]) -fi - -# Code Coverage -AC_ARG_ENABLE([coverage], - AC_HELP_STRING([--enable-coverage], - [enable code coverage generation]), - [] - [enable_coverage=no]) - -if test "$enable_coverage" = "yes" -then - AC_MSG_RESULT([enable Code Coverage generation]) - - CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage" -fi - -# Enable/disable samples compilation. -AC_ARG_ENABLE([samples], - AC_HELP_STRING([--disable-samples], - [disable sample code]), - [], - [enable_samples="yes"]) - -if test "$enable_samples" = "no" -then - AC_MSG_RESULT([disable sample code.]) - SAMPLE_SUBDIR="" -else - SAMPLE_SUBDIR="samples" -fi - -# Enable/disable tools compilation. -AC_ARG_ENABLE([tools], - AC_HELP_STRING([--disable-tools], - [disable tools code]), - [], - [enable_tools="yes"]) - -if test "$enable_tools" = "no" -then - AC_MSG_RESULT([disable tools code.]) - TOOLS_SUBDIR="" -else - TOOLS_SUBDIR="tools" -fi - -AC_SUBST([enable_net]) -AC_SUBST([enable_3d]) -AC_SUBST([enable_pacs]) -AC_SUBST([enable_sound]) -AC_SUBST([enable_georges]) -AC_SUBST([enable_ligo]) -AC_SUBST([enable_cegui]) - -AC_SUBST([NEL_SUBDIRS]) -AC_SUBST([SAMPLE_SUBDIR]) -AC_SUBST([TOOLS_SUBDIR]) -AC_SUBST([CEGUI_SUBDIR]) - -# ==================================================================== -# Checks for programs. -# ==================================================================== - -# ==================================================================== -# Configure Settings -# ==================================================================== - -# Disable the static linking by default -# AC_DISABLE_STATIC - -# Use C++ compiler as a default for the compilation tests. -AC_LANG([C++]) - - -# ==================================================================== -# Debug/optimized compilation mode -# ==================================================================== - -AM_NEL_DEBUG - -AC_ARG_WITH([logging], - AC_HELP_STRING([--without-logging], - [be silent on stdout and in no log.log]), - [], - [with_logging=yes]) - -if test "$with_logging" = "yes" -then - AC_DEFINE([NEL_DEFAULT_DISPLAYER], 1) - AC_DEFINE([NEL_LOG_IN_FILE], 1) -fi - -# ==================================================================== -# Checks for typedefs, structures, and compiler characteristics. -# ==================================================================== - -# Test endianness -AC_C_BIGENDIAN - -# Supress GCC "multi-character character constant" warnings. -if test "$ac_cv_cxx_compiler_gnu" = "yes"; -then - if test "$with_debug" = "yes" - then - # - # When debugging variables are declared for the sole purpose of - # inspecting their content with a debugger. They are not used - # in the code itself and this is legitimate, hence the -Wno-unused - # - CXXFLAGS="$CXXFLAGS -Wno-unused" - fi -fi - -# Add some common define -if test "$ac_cv_cxx_compiler_gnu" = "yes"; -then - CXXFLAGS="$CXXFLAGS -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused" -fi - - -# ==================================================================== -# Checks for header and lib files. -# ==================================================================== - -AC_FUNC_ALLOCA -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_HEADER_TIME -AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h sys/time.h]) -AC_CHECK_LIB([pthread], [pthread_create]) -AC_CHECK_LIB([dl], [dlopen]) - - -# ==================================================================== -# Checks for typedefs, structures, and compiler characteristics. -# ==================================================================== - -AC_HEADER_STDBOOL -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T -AC_HEADER_TIME -AC_STRUCT_TM -AC_C_VOLATILE -AC_CHECK_TYPES([ptrdiff_t]) -AC_CHECK_TYPES([size_t]) -AC_CHECK_TYPES([uintptr_t]) - - -# ==================================================================== -# Checks for library functions. -# ==================================================================== - -AC_FUNC_CLOSEDIR_VOID -AC_FUNC_ERROR_AT_LINE -AC_PROG_GCC_TRADITIONAL -AC_FUNC_MALLOC -AC_FUNC_MEMCMP -AC_FUNC_REALLOC -AC_FUNC_SELECT_ARGTYPES -AC_TYPE_SIGNAL -AC_FUNC_STAT -AC_FUNC_STRFTIME -AC_FUNC_FORK -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([floor getcwd gethostbyaddr gethostbyname gethostname gettimeofday inet_ntoa memmove memset mkdir pow select socket sqrt strcasecmp strchr strdup strerror strrchr strstr strtoul sys/time.h]) - - -# ==================================================================== -# X11 - -AC_PATH_X - -if test ! "$no_x" = "yes" -then - if test ! X"$x_libraries" = X - then - LIBS="$LIBS -L$x_libraries" - fi - - if test ! X"$x_includes" = X - then - CXXFLAGS="$CXXFLAGS -I$x_includes" - fi -else - if test "$enable_3d" = "yes" - then - AC_MSG_ERROR([X11 must be installed for NeL 3d library, use --disable-3d if you don't need NeL 3d library]) - fi -fi - -# ==================================================================== -# LibXML - -# Use C compiler as a default for the libxml tests. -AC_LANG([C]) - -AM_PATH_XML2([2.0.0], [], [AC_MSG_ERROR([libxml2 must be installed])]) - -CXXFLAGS="$CXXFLAGS $XML_CFLAGS $XML_CPPFLAGS" - -LIBS="$LIBS $XML_LIBS" - -# Use C++ compiler as a default for the compilation tests. -AC_LANG([C++]) - -# ==================================================================== -# libpng - -AC_CHECK_HEADER(png.h, [], AC_MSG_ERROR([libpng must be installed])) - -# ==================================================================== -# libjpeg - -AC_CHECK_HEADER(jpeglib.h, [], AC_MSG_ERROR([libjpeg must be installed])) - -# ==================================================================== -# Checks for libraries. -# ==================================================================== - -# ==================================================================== -# GTK 2.0+ - -AC_ARG_WITH([gtk], - AC_HELP_STRING([--with-gtk], - [add GTK dependent code like GTK displayer]), - [], - [with_gtk=no]) - -if test "$with_gtk" = "yes" -then - AC_LANG([C]) - - AM_PATH_GTK_2_0([2.0.0], - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_DEFINE(NL_USE_GTK, [], [Undef if you don't want to use anything GTK based like the GTK Displayer] -) - ) - - AC_LANG([C++]) - - AC_SUBST([with_gtk]) -fi - -# ==================================================================== -# CEGUI - -if test "$enable_cegui" = "yes" -then - PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.4, - [], - [ - AC_MSG_ERROR([Couldn't find CEGUI or tests failed: -$CEGUI_PKG_ERRORS -Please go to http://crayzedsgui.sourceforge.net to get the latest, or check -config.log to see why the tests failed, and fix it.]) - ]) -fi - -# ==================================================================== -# FreeType 2 - -AM_PATH_FREETYPE($enable_3d) - - -# ==================================================================== -# OpenGL - -AM_PATH_OPENGL($enable_3d) - - -# ==================================================================== -# Check for XF86VidMode extension (-lXxf86vm) - -AM_PATH_XF86VIDMODE - - -# ==================================================================== -# FMOD, OpenAL - -if test "$enable_sound" = "yes" -then - AM_PATH_FMOD("no") - AM_PATH_OPENAL("no") - if test "$have_fmod" = "no" -a "$have_openal" = "no" - then - AC_MSG_ERROR([Either FMod or OpenAL must be installed to use sound.]) - fi - if test "$have_fmod" = "yes" - then - SOUND_SUBDIRS="fmod" - else - SOUND_SUBDIRS="" - fi - if test "$have_openal" = "yes" - then - SOUND_SUBDIRS="$SOUND_SUBDIRS openal" - - XIPH_PATH_OGG([], AC_MSG_ERROR([Driver OpenAL Requires libogg!])) - XIPH_PATH_VORBIS([], AC_MSG_ERROR([Driver OpenAL Requires libvorbis!])) - fi - AC_SUBST([SOUND_SUBDIRS]) -fi - - -# ==================================================================== -# CppTest - -#AM_PATH_CPPTEST($enable_tests) - -# ==================================================================== -# Arrange for the include directory to be in the search path even when -# build is done outside the source tree -# Put the nelconfig.h define -CXXFLAGS="$CXXFLAGS -I\${top_srcdir}/include -DHAVE_NELCONFIG_H" - -# ==================================================================== -# Checks for library functions. -# ==================================================================== - - -# ==================================================================== -# Output files to generate. -# ==================================================================== - -AC_CONFIG_FILES([Makefile \ - include/Makefile \ - include/nel/Makefile \ - include/nel/ligo/Makefile \ - include/nel/misc/Makefile \ - include/nel/net/Makefile \ - include/nel/3d/Makefile \ - include/nel/pacs/Makefile \ - include/nel/sound/Makefile \ - include/nel/georges/Makefile \ - include/nel/cegui/Makefile \ - src/Makefile \ - src/misc/Makefile \ - src/misc/nel-misc.pc \ - src/misc/config_file/Makefile \ - src/net/Makefile \ - src/3d/Makefile \ - src/3d/nel-3d.pc \ - src/3d/driver/Makefile \ - src/3d/driver/opengl/Makefile \ - src/3d/driver/opengl/nel-driverogl.pc \ - src/pacs/Makefile \ - src/sound/Makefile \ - src/sound/driver/Makefile \ - src/sound/driver/fmod/Makefile \ - src/sound/driver/openal/Makefile \ - src/georges/Makefile \ - src/ligo/Makefile \ - src/cegui/Makefile \ - tools/Makefile \ - tools/3d/Makefile \ - tools/3d/build_coarse_mesh/Makefile \ - tools/3d/build_far_bank/Makefile \ - tools/3d/build_smallbank/Makefile \ - tools/3d/ig_lighter/Makefile \ - tools/3d/ig_lighter_lib/Makefile \ - tools/3d/panoply_maker/Makefile \ - tools/3d/zone_dependencies/Makefile \ - tools/3d/zone_ig_lighter/Makefile \ - tools/3d/zone_lib/Makefile \ - tools/3d/zone_lighter/Makefile \ - tools/3d/zone_welder/Makefile \ - tools/misc/Makefile \ - tools/misc/bnp_make/Makefile \ - tools/misc/disp_sheet_id/Makefile \ - tools/misc/make_sheet_id/Makefile \ - tools/misc/xml_packer/Makefile \ - tools/pacs/Makefile \ - tools/pacs/build_ig_boxes/Makefile \ - tools/pacs/build_indoor_rbank/Makefile \ - tools/pacs/build_rbank/Makefile \ - samples/Makefile \ - samples/sound_sources/Makefile \ - samples/pacs/Makefile \ - samples/georges/Makefile \ - samples/3d/Makefile \ - samples/3d/font/Makefile \ - samples/3d/cluster_viewer/Makefile \ - samples/3d/cluster_viewer/shapes/Makefile \ - samples/3d/cluster_viewer/groups/Makefile \ - samples/3d/cluster_viewer/fonts/Makefile \ - samples/3d/cegui/Makefile \ - samples/misc/Makefile \ - samples/misc/command/Makefile \ - samples/misc/configfile/Makefile \ - samples/misc/debug/Makefile \ - samples/misc/i18n/Makefile \ - samples/misc/log/Makefile \ - samples/misc/strings/Makefile \ - samples/misc/types_check/Makefile \ - samples/net/Makefile \ - samples/net/chat/Makefile \ - samples/net/udp/Makefile \ - samples/net/login_system/Makefile \ - nel-config - -]) -AC_OUTPUT - -# samples/net/class_transport/Makefile \ -# tools/nel_unit_test/Makefile \ -# tools/nel_unit_test/misc_ut/Makefile \ -# tools/nel_unit_test/ligo_ut/Makefile \ -# tools/nel_unit_test/net_ut/Makefile \ -# tools/nel_unit_test/net_ut/net_service_lib_test/Makefile \ -# tools/nel_unit_test/net_ut/net_module_lib_test/Makefile \ -# End of configure.in diff --git a/code/nel/include/Makefile.am b/code/nel/include/Makefile.am deleted file mode 100644 index 193d2e405..000000000 --- a/code/nel/include/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = nel - -pkginclude_HEADERS = nelconfig.h - -# End of Makefile.am diff --git a/code/nel/include/nel/3d/Makefile.am b/code/nel/include/nel/3d/Makefile.am deleted file mode 100644 index 8118d8348..000000000 --- a/code/nel/include/nel/3d/Makefile.am +++ /dev/null @@ -1,343 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -includedir = ${prefix}/include/nel/3d - -include_HEADERS = \ -animatable.h \ -animated_lightmap.h \ -animated_material.h \ -animated_morph.h \ -animated_value.h \ -animation.h \ -animation_optimizer.h \ -animation_playlist.h \ -animation_set.h \ -animation_set_user.h \ -animation_time.h \ -anim_ctrl.h \ -anim_detail_trav.h \ -async_file_manager_3d.h \ -async_texture_block.h \ -async_texture_manager.h \ -bezier_patch.h \ -bloom_effect.h \ -bone.h \ -bsp_tree.h \ -camera_col.h \ -camera.h \ -channel_mixer.h \ -clip_trav.h \ -cloud.h \ -cloud_scape.h \ -cloud_scape_user.h \ -cluster.h \ -coarse_mesh_build.h \ -coarse_mesh_manager.h \ -computed_string.h \ -cube_grid.h \ -cube_map_builder.h \ -debug_vb.h \ -deform_2d.h \ -driver.h \ -driver_material_inline.h \ -driver_user.h \ -dru.h \ -event_mouse_listener.h \ -fasthls_modifier.h \ -fast_ptr_list.h \ -flare_model.h \ -flare_shape.h \ -font_generator.h \ -font_manager.h \ -frustum.h \ -heat_haze.h \ -height_map.h \ -hls_color_texture.h \ -hls_texture_bank.h \ -hls_texture_manager.h \ -hrc_trav.h \ -ig_surface_light_build.h \ -ig_surface_light.h \ -index_buffer.h \ -init_3d.h \ -instance_group_user.h \ -instance_lighter.h \ -key.h \ -landscape_collision_grid.h \ -landscape_def.h \ -landscape_face_vector_manager.h \ -landscape.h \ -landscapeig_manager.h \ -landscape_model.h \ -landscape_profile.h \ -landscape_user.h \ -landscapevb_allocator.h \ -landscapevb_info.h \ -landscape_vegetable_block.h \ -layered_ordering_table.h \ -light_contribution.h \ -light.h \ -light_influence_interpolator.h \ -lighting_manager.h \ -light_trav.h \ -light_user.h \ -load_balancing_trav.h \ -lod_character_builder.h \ -lod_character_instance.h \ -lod_character_manager.h \ -lod_character_shape_bank.h \ -lod_character_shape.h \ -lod_character_texture.h \ -logic_info.h \ -material.h \ -matrix_3x4.h \ -mesh_base.h \ -mesh_base_instance.h \ -mesh_blender.h \ -mesh_block_manager.h \ -mesh_geom.h \ -mesh.h \ -mesh_instance.h \ -mesh_morpher.h \ -mesh_mrm.h \ -mesh_mrm_instance.h \ -mesh_mrm_skinned.h \ -mesh_mrm_skinned_instance.h \ -mesh_multi_lod.h \ -mesh_multi_lod_instance.h \ -mesh_vertex_program.h \ -meshvp_per_pixel_light.h \ -meshvp_wind_tree.h \ -mini_col.h \ -motion_blur.h \ -mrm_builder.h \ -mrm_internal.h \ -mrm_level_detail.h \ -mrm_mesh.h \ -mrm_parameters.h \ -nelu.h \ -noise_3d.h \ -occlusion_query.h \ -ordering_table.h \ -packed_world.h \ -packed_zone.h \ -particle_system.h \ -particle_system_manager.h \ -particle_system_model.h \ -particle_system_process.h \ -particle_system_shape.h \ -patchdlm_context.h \ -patch.h \ -patch_rdr_pass.h \ -patchuv_locator.h \ -play_list_manager.h \ -play_list_manager_user.h \ -play_list_user.h \ -point_light.h \ -point_light_influence.h \ -point_light_model.h \ -point_light_named_array.h \ -point_light_named.h \ -portal.h \ -primitive_profile.h \ -ps_allocator.h \ -ps_attrib.h \ -ps_attrib_maker_bin_op.h \ -ps_attrib_maker_bin_op_inline.h \ -ps_attrib_maker.h \ -ps_attrib_maker_helper.h \ -ps_attrib_maker_iterators.h \ -ps_attrib_maker_template.h \ -ps_color.h \ -ps_direction.h \ -ps_dot.h \ -ps_edit.h \ -ps_emitter.h \ -ps_face.h \ -ps_face_look_at.h \ -ps_fan_light.h \ -ps_float.h \ -ps_force.h \ -ps_int.h \ -ps_iterator.h \ -ps_light.h \ -ps_located.h \ -ps_lod.h \ -ps_macro.h \ -ps_mesh.h \ -ps_misc.h \ -ps_particle2.h \ -ps_particle_basic.h \ -ps_particle.h \ -ps_plane_basis.h \ -ps_plane_basis_maker.h \ -ps_quad.h \ -ps_register_color_attribs.h \ -ps_register_float_attribs.h \ -ps_register_int_attribs.h \ -ps_register_plane_basis_attribs.h \ -ps_ribbon_base.h \ -ps_ribbon.h \ -ps_ribbon_look_at.h \ -ps_shockwave.h \ -ps_sound.h \ -ps_spawn_info.h \ -ps_tail_dot.h \ -ps_util.h \ -ps_zone.h \ -ptr_set.h \ -quad_effect.h \ -quad_grid_clip_cluster.h \ -quad_grid_clip_manager.h \ -quad_grid.h \ -quad_tree.h \ -radix_sort.h \ -raw_skin.h \ -raw_skinned.h \ -ray_mesh.h \ -register_3d.h \ -render_trav.h \ -root_model.h \ -scene_group.h \ -scene.h \ -scene_user.h \ -scissor.h \ -seg_remanence.h \ -seg_remanence_shape.h \ -shader.h \ -shadow_map.h \ -shadow_map_manager.h \ -shadow_poly_receiver.h \ -shadow_skin.h \ -shape_bank.h \ -shape_bank_user.h \ -shape.h \ -shape_info.h \ -shifted_triangle_cache.h \ -skeleton_model.h \ -skeleton_shape.h \ -skeleton_spawn_script.h \ -skeleton_weight.h \ -static_quad_grid.h \ -stripifier.h \ -surface_light_grid.h \ -tangent_space_build.h \ -target_anim_ctrl.h \ -tess_block.h \ -tessellation.h \ -tess_face_priority_list.h \ -tess_list.h \ -text_context.h \ -text_context_user.h \ -texture_blank.h \ -texture_blend.h \ -texture_bloom.h \ -texture_bump.h \ -texture_cube.h \ -texture_dlm.h \ -texture_emboss.h \ -texture_far.h \ -texture_file.h \ -texture_font.h \ -texture_grouped.h \ -texture.h \ -texture_mem.h \ -texture_multi_file.h \ -texture_near.h \ -texture_user.h \ -tile_bank.h \ -tile_color.h \ -tile_element.h \ -tile_far_bank.h \ -tile_light_influence.h \ -tile_lumel.h \ -tile_noise_map.h \ -tile_vegetable_desc.h \ -track_bezier.h \ -track.h \ -track_keyframer.h \ -track_sampled_common.h \ -track_sampled_quat.h \ -track_sampled_quat_small_header.h \ -track_sampled_vector.h \ -track_tcb.h \ -transformable.h \ -transform.h \ -transform_shape.h \ -trav_scene.h \ -u_3d_mouse_listener.h \ -u_animation.h \ -u_animation_set.h \ -u_bone.h \ -u_camera.h \ -u_cloud_scape.h \ -u_driver.h \ -u_instance_group.h \ -u_instance.h \ -u_instance_material.h \ -u_landscape.h \ -u_light.h \ -u_material.h \ -u_particle_system_instance.h \ -u_particle_system_sound.h \ -u_play_list.h \ -u_play_list_manager.h \ -u_point_light.h \ -u_ps_sound_impl.h \ -u_ps_sound_interface.h \ -u_scene.h \ -u_shape_bank.h \ -u_shape.h \ -u_skeleton.h \ -u_text_context.h \ -u_texture.h \ -u_track.h \ -u_transformable.h \ -u_transform.h \ -u_visual_collision_entity.h \ -u_visual_collision_manager.h \ -u_visual_collision_mesh.h \ -u_water_env_map.h \ -u_water.h \ -vegetable_blend_layer_model.h \ -vegetable_clip_block.h \ -vegetable_def.h \ -vegetable.h \ -vegetable_instance_group.h \ -vegetable_light_ex.h \ -vegetable_manager.h \ -vegetable_quadrant.h \ -vegetable_shape.h \ -vegetable_sort_block.h \ -vegetable_uv8.h \ -vegetablevb_allocator.h \ -vertex_buffer.h \ -vertex_buffer_heap.h \ -vertex_program.h \ -vertex_program_parse.h \ -vertex_stream_manager.h \ -viewport.h \ -visual_collision_entity.h \ -visual_collision_entity_user.h \ -visual_collision_manager.h \ -visual_collision_manager_user.h \ -visual_collision_mesh.h \ -water_env_map.h \ -water_env_map_user.h \ -water_height_map.h \ -water_model.h \ -water_pool_manager.h \ -water_shape.h \ -zone_corner_smoother.h \ -zone.h \ -zone_lighter.h \ -zone_manager.h \ -zone_search.h \ -zone_smoother.h \ -zone_symmetrisation.h \ -zone_tgt_smoother.h - -# End of Makefile.am diff --git a/code/nel/include/nel/Makefile.am b/code/nel/include/nel/Makefile.am deleted file mode 100644 index 7e4686f14..000000000 --- a/code/nel/include/nel/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -DIST_SUBDIRS = net 3d pacs sound misc georges ligo - -SUBDIRS = @NEL_SUBDIRS@ - -includedir = ${prefix}/include/nel - -# End of Makefile.am - diff --git a/code/nel/include/nel/cegui/Makefile.am b/code/nel/include/nel/cegui/Makefile.am deleted file mode 100644 index ba2530dff..000000000 --- a/code/nel/include/nel/cegui/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2001-08-01 08:45:06 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -includedir = ${prefix}/include/nel/cegui - -include_HEADERS = nelrenderer.h nelresourceprovider.h neltexture.h - -# End of Makefile.am diff --git a/code/nel/include/nel/georges/Makefile.am b/code/nel/include/nel/georges/Makefile.am deleted file mode 100644 index 153e9b102..000000000 --- a/code/nel/include/nel/georges/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -includedir = ${prefix}/include/nel/georges - -include_HEADERS = load_form.h \ - u_form_dfn.h \ - u_form_elm.h \ - u_form.h \ - u_form_loader.h \ - u_type.h - -# End of Makefile.am diff --git a/code/nel/include/nel/ligo/Makefile.am b/code/nel/include/nel/ligo/Makefile.am deleted file mode 100644 index 48fb3c54b..000000000 --- a/code/nel/include/nel/ligo/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -includedir = ${prefix}/include/nel/ligo - -include_HEADERS = ligo_config.h \ - primitive_class.h \ - primitive_configuration.h \ - primitive.h \ - primitive_utils.h - -# End of Makefile.am diff --git a/code/nel/include/nel/misc/Makefile.am b/code/nel/include/nel/misc/Makefile.am deleted file mode 100644 index 75bde6b95..000000000 --- a/code/nel/include/nel/misc/Makefile.am +++ /dev/null @@ -1,143 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -includedir = ${prefix}/include/nel/misc - -include_HEADERS = aabbox.h \ - algo.h \ - app_context.h \ - array_2d.h \ - async_file_manager.h \ - big_file.h \ - bitmap.h \ - bit_mem_stream.h \ - bit_set.h \ - block_memory.h \ - bsphere.h \ - buf_fifo.h \ - check_fpu.h \ - class_id.h \ - class_registry.h \ - command.h \ - common.h \ - config_file.h \ - contiguous_block_allocator.h \ - co_task.h \ - cpu_time_stat.h \ - debug.h \ - di_event_emitter.h \ - diff_tool.h \ - displayer.h \ - dummy_window.h \ - dynloadlib.h \ - eid_translator.h \ - entity_id.h \ - enum_bitset.h \ - eval_num_expr.h \ - event_emitter.h \ - event_emitter_multi.h \ - event_listener.h \ - event_server.h \ - events.h \ - factory.h \ - fast_floor.h \ - fast_mem.h \ - file.h \ - fixed_size_allocator.h \ - game_device_events.h \ - game_device.h \ - geom_ext.h \ - grid_traversal.h \ - gtk_displayer.h \ - heap_memory.h \ - hierarchical_timer.h \ - historic.h \ - i18n.h \ - input_device.h \ - input_device_manager.h \ - input_device_server.h \ - inter_window_msg_queue.h \ - i_xml.h \ - keyboard_device.h \ - line.h \ - log.h \ - matrix.h \ - md5.h \ - mem_displayer.h \ - mem_stream.h \ - mouse_device.h \ - mouse_smoother.h \ - mutable_container.h \ - mutex.h \ - noise_value.h \ - object_arena_allocator.h \ - object_vector.h \ - o_xml.h \ - path.h \ - plane.h \ - plane_inline.h \ - polygon.h \ - pool_memory.h \ - progress_callback.h \ - p_thread.h \ - quad.h \ - quat.h \ - random.h \ - reader_writer.h \ - rect.h \ - report.h \ - resource_ptr.h \ - resource_ptr_inline.h \ - rgba.h \ - sha1.h \ - shared_memory.h \ - sheet_id.h \ - singleton.h \ - smart_ptr.h \ - smart_ptr_inline.h \ - speaker_listener.h \ - sstring.h \ - static_map.h \ - stl_block_allocator.h \ - stl_block_list.h \ - stop_watch.h \ - stream.h \ - stream_inline.h \ - string_common.h \ - string_conversion.h \ - string_id_array.h \ - string_mapper.h \ - string_stream.h \ - system_info.h \ - task_manager.h \ - tds.h \ - thread.h \ - time_nl.h \ - timeout_assertion_thread.h \ - traits_nl.h \ - triangle.h \ - twin_map.h \ - types_nl.h \ - ucstring.h \ - uv.h \ - value_smoother.h \ - variable.h \ - vector_2d.h \ - vector_2f.h \ - vectord.h \ - vectord_inline.h \ - vector.h \ - vector_h.h \ - vector_inline.h \ - win32_util.h \ - win_displayer.h \ - window_displayer.h \ - win_event_emitter.h \ - win_thread.h \ - win_tray.h \ - words_dictionary.h \ - xml_pack.h - -# End of Makefile.am diff --git a/code/nel/include/nel/net/Makefile.am b/code/nel/include/nel/net/Makefile.am deleted file mode 100644 index 7a5dfe1be..000000000 --- a/code/nel/include/nel/net/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -includedir = ${prefix}/include/nel/net - -include_HEADERS = admin.h \ - buf_client.h \ - buf_net_base.h \ - buf_server.h \ - buf_sock.h \ - callback_client.h \ - callback_net_base.h \ - callback_server.h \ - cvar_log_filter.h \ - dummy_tcp_sock.h \ - email.h \ - inet_address.h \ - listen_sock.h \ - login_client.h \ - login_cookie.h \ - login_server.h \ - message.h \ - message_recorder.h \ - module_builder_parts.h \ - module_common.h \ - module_gateway.h \ - module.h \ - module_manager.h \ - module_message.h \ - module_socket.h \ - naming_client.h \ - net_displayer.h \ - net_log.h \ - net_manager.h \ - pacs_client.h \ - service.h \ - sock.h \ - tcp_sock.h \ - transport_class.h \ - udp_sim_sock.h \ - udp_sock.h \ - unified_network.h \ - unitime.h \ - varpath.h - -# End of Makefile.am diff --git a/code/nel/include/nel/pacs/Makefile.am b/code/nel/include/nel/pacs/Makefile.am deleted file mode 100644 index 7160ec65c..000000000 --- a/code/nel/include/nel/pacs/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -includedir = ${prefix}/include/nel/pacs - -include_HEADERS = u_collision_desc.h \ - u_global_position.h \ - u_global_retriever.h \ - u_move_container.h \ - u_move_primitive.h \ - u_primitive_block.h \ - u_retriever_bank.h - -# End of Makefile.am - diff --git a/code/nel/include/nel/sound/Makefile.am b/code/nel/include/nel/sound/Makefile.am deleted file mode 100644 index 77dd246a6..000000000 --- a/code/nel/include/nel/sound/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -includedir = ${prefix}/include/nel/sound - -include_HEADERS = sound_animation.h \ - sound_anim_manager.h \ - sound_anim_marker.h \ - u_audio_mixer.h \ - u_listener.h \ - u_source.h - -# End of Makefile.am diff --git a/code/nel/nel.m4 b/code/nel/nel.m4 deleted file mode 100644 index e69de29bb..000000000 diff --git a/code/nel/samples/3d/Makefile.am b/code/nel/samples/3d/Makefile.am deleted file mode 100644 index d00e99366..000000000 --- a/code/nel/samples/3d/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005/04/04 09:45:05 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = font cluster_viewer @CEGUI_SUBDIR@ - - -# End of Makefile.am - diff --git a/code/nel/samples/3d/cegui/Makefile.am b/code/nel/samples/3d/cegui/Makefile.am deleted file mode 100644 index afc817166..000000000 --- a/code/nel/samples/3d/cegui/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = demonel_8.sln demonel_8.vcproj demonel.rc demonel.sln demonel.vcproj icon1.ico datafiles - -bin_PROGRAMS = nel_sample_cegui - -nel_sample_cegui_SOURCES = main.cpp NeLDriver.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src @CEGUI_CFLAGS@ - -nel_sample_cegui_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la \ - ../../../src/cegui/libnelceguirenderer.la \ - @CEGUI_LIBS@ - - -# End of Makefile.am - diff --git a/code/nel/samples/3d/cluster_viewer/Makefile.am b/code/nel/samples/3d/cluster_viewer/Makefile.am deleted file mode 100644 index 5814a0394..000000000 --- a/code/nel/samples/3d/cluster_viewer/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = shapes groups fonts - -bin_PROGRAMS = cluster_viewer - -cluster_viewer_SOURCES = main.cpp - -cluster_viewerdir = $(datadir)/nel/samples/cluster_viewer - -cluster_viewer_DATA = readme.txt main.cvs - -AM_CXXFLAGS = -DCV_DIR="\"$(cluster_viewerdir)\"" -I$(top_srcdir)/src - -cluster_viewer_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la - - -# End of Makefile.am - diff --git a/code/nel/samples/3d/cluster_viewer/fonts/Makefile.am b/code/nel/samples/3d/cluster_viewer/fonts/Makefile.am deleted file mode 100644 index 11e9a8f31..000000000 --- a/code/nel/samples/3d/cluster_viewer/fonts/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -cluster_viewerdir = $(datadir)/nel/samples/cluster_viewer/fonts/ - -cluster_viewer_DATA = n019003l.pfb - -# End of Makefile.am - diff --git a/code/nel/samples/3d/cluster_viewer/groups/Makefile.am b/code/nel/samples/3d/cluster_viewer/groups/Makefile.am deleted file mode 100644 index 54cdb5867..000000000 --- a/code/nel/samples/3d/cluster_viewer/groups/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -cluster_viewerdir = $(datadir)/nel/samples/cluster_viewer/groups/ - -cluster_viewer_DATA = street.ig - -# End of Makefile.am - diff --git a/code/nel/samples/3d/cluster_viewer/shapes/Makefile.am b/code/nel/samples/3d/cluster_viewer/shapes/Makefile.am deleted file mode 100644 index 3b251867a..000000000 --- a/code/nel/samples/3d/cluster_viewer/shapes/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -cluster_viewerdir = $(datadir)/nel/samples/cluster_viewer/shapes/ - -cluster_viewer_DATA = box02.shape \ - sphere01.shape \ - sphere02.shape \ - sphere03.shape \ - sphere04.shape \ - sphere05.shape \ - sphere06.shape \ - sphere07.shape \ - sphere08.shape - -# End of Makefile.am - diff --git a/code/nel/samples/3d/font/Makefile.am b/code/nel/samples/3d/font/Makefile.am deleted file mode 100644 index 5548ec8f6..000000000 --- a/code/nel/samples/3d/font/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = font - -font_SOURCES = main.cpp - -fontdir = $(datadir)/nel/samples/font -font_DATA = beteckna.ttf - -AM_CXXFLAGS = -DFONT_DIR="\"$(fontdir)\"" -I$(top_srcdir)/src - -font_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la - - -# End of Makefile.am - diff --git a/code/nel/samples/Makefile.am b/code/nel/samples/Makefile.am deleted file mode 100644 index 98edb586d..000000000 --- a/code/nel/samples/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# -# $Id: Makefile.am,v 1.2 2005/04/13 12:37:26 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -DIST_SUBDIRS = sound_sources pacs georges 3d net misc - -SUBDIRS = pacs georges 3d net misc - -# End of Makefile.am - diff --git a/code/nel/samples/georges/Makefile.am b/code/nel/samples/georges/Makefile.am deleted file mode 100644 index bf2c83d5f..000000000 --- a/code/nel/samples/georges/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = georges_sample_8.vcproj georges_sample.sln georges_sample.vcproj - -bin_PROGRAMS = georges - -georges_SOURCES = main.cpp - -georgesdir = $(datadir)/nel/samples/georges - -georges_DATA = boolean.typ coolfilesinfo.dfn default.sample_config int.typ positiondata.dfn sample_config.dfn string.typ - -AM_CXXFLAGS = -DGF_DIR="\"$(georgesdir)\"" -I$(top_srcdir)/src - - -georges_LDADD = ../../src/misc/libnelmisc.la \ - ../../src/georges/libnelgeorges.la - - -# End of Makefile.am diff --git a/code/nel/samples/misc/Makefile.am b/code/nel/samples/misc/Makefile.am deleted file mode 100644 index 0e13cb6f1..000000000 --- a/code/nel/samples/misc/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -# -# $Id: Makefile.am,v 1.2 2005-04-13 12:37:26 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = command configfile debug i18n log strings - -# End of Makefile.am - diff --git a/code/nel/samples/misc/command/Makefile.am b/code/nel/samples/misc/command/Makefile.am deleted file mode 100644 index 890a9fa18..000000000 --- a/code/nel/samples/misc/command/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = command_8.vcproj main.dsp main.dsw - -bin_PROGRAMS = command - -command_SOURCES = main.cpp - -commanddir = $(datadir)/nel/samples/command - -AM_CXXFLAGS = -I$(top_srcdir)/src - -command_LDADD = ../../../src/misc/libnelmisc.la - -# End of Makefile.am - diff --git a/code/nel/samples/misc/configfile/Makefile.am b/code/nel/samples/misc/configfile/Makefile.am deleted file mode 100644 index 538d3af28..000000000 --- a/code/nel/samples/misc/configfile/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = configfile_8.vcproj main.dsp main.dsw - -bin_PROGRAMS = configfile - -configfile_SOURCES = main.cpp - -configfiledir = $(datadir)/nel/samples/configfile - -configfile_DATA = simpletest.txt - -AM_CXXFLAGS = -DCF_DIR="\"$(configfiledir)\"" -I$(top_srcdir)/src - -configfile_LDADD = ../../../src/misc/libnelmisc.la - - -# End of Makefile.am - diff --git a/code/nel/samples/misc/debug/Makefile.am b/code/nel/samples/misc/debug/Makefile.am deleted file mode 100644 index d8d2c733a..000000000 --- a/code/nel/samples/misc/debug/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = debug_8.vcproj main.dsp main.dsw - -bin_PROGRAMS = debug - -debug_SOURCES = main.cpp - -debugdir = $(datadir)/nel/samples/debug - -AM_CXXFLAGS = -I$(top_srcdir)/src - -debug_LDADD = ../../../src/misc/libnelmisc.la - -# End of Makefile.am - diff --git a/code/nel/samples/misc/i18n/Makefile.am b/code/nel/samples/misc/i18n/Makefile.am deleted file mode 100644 index 6c9c574c9..000000000 --- a/code/nel/samples/misc/i18n/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = i18n_8.vcproj main.dsp main.dsw - -bin_PROGRAMS = i18n - -i18n_SOURCES = main.cpp - -i18ndir = $(datadir)/nel/samples/i18n - -i18n_DATA = en.uxt fr.uxt de.uxt - -AM_CXXFLAGS = -DI18N_DIR="\"$(i18ndir)\"" -I$(top_srcdir)/src - -i18n_LDADD = ../../../src/misc/libnelmisc.la - - -# End of Makefile.am - diff --git a/code/nel/samples/misc/log/Makefile.am b/code/nel/samples/misc/log/Makefile.am deleted file mode 100644 index 3d57e533d..000000000 --- a/code/nel/samples/misc/log/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = log_8.vcproj main.dsp main.dsw - -bin_PROGRAMS = log - -log_SOURCES = main.cpp - -logdir = $(datadir)/nel/samples/log - -AM_CXXFLAGS = -I$(top_srcdir)/src - -log_LDADD = ../../../src/misc/libnelmisc.la - -# End of Makefile.am - diff --git a/code/nel/samples/misc/strings/Makefile.am b/code/nel/samples/misc/strings/Makefile.am deleted file mode 100644 index 151e8ef32..000000000 --- a/code/nel/samples/misc/strings/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = main.dsp main.dsw strings_8.vcproj - -bin_PROGRAMS = strings - -strings_SOURCES = main.cpp - -stringsdir = $(datadir)/nel/samples/strings - -AM_CXXFLAGS = -I$(top_srcdir)/src - -strings_LDADD = ../../../src/misc/libnelmisc.la - -# End of Makefile.am - diff --git a/code/nel/samples/misc/types_check/Makefile.am b/code/nel/samples/misc/types_check/Makefile.am deleted file mode 100644 index 9c79d6aa2..000000000 --- a/code/nel/samples/misc/types_check/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = main.dsp main.dsw types_check_8.vcproj - -bin_PROGRAMS = types_check - -types_check_SOURCES = main.cpp - -types_checkdir = $(datadir)/nel/samples/types_check - -AM_CXXFLAGS = -I$(top_srcdir)/src - -types_check_LDADD = ../../../src/misc/libnelmisc.la - -# End of Makefile.am - diff --git a/code/nel/samples/net/Makefile.am b/code/nel/samples/net/Makefile.am deleted file mode 100644 index ad7388761..000000000 --- a/code/nel/samples/net/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005/04/13 12:37:26 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = chat udp login_system - - -# End of Makefile.am - diff --git a/code/nel/samples/net/chat/Makefile.am b/code/nel/samples/net/chat/Makefile.am deleted file mode 100644 index bc2df9ef9..000000000 --- a/code/nel/samples/net/chat/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005/04/13 12:37:26 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = chatserver chatclient - -chatserver_SOURCES = server.cpp - -chatclient_SOURCES = client.cpp kbhit.h kbhit.cpp - -chatserverdir=$(datadir)/nel/samples/net/chat -chatserver_DATA=chat_service.cfg - -chatclientdir=$(datadir)/nel/samples/net/chat -chatclient_DATA=client.cfg - -AM_CXXFLAGS = -DCHAT_DIR="\"$(chatclientdir)\"" -I$(top_srcdir)/src - -chatserver_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/net/libnelnet.la - -chatclient_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/net/libnelnet.la - -# End of Makefile.am diff --git a/code/nel/samples/net/login_system/Makefile.am b/code/nel/samples/net/login_system/Makefile.am deleted file mode 100644 index 5ef4fe26c..000000000 --- a/code/nel/samples/net/login_system/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-13 12:37:26 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = main.dsw client.dsp client.cfg frontend_service.cfg frontend_service.dsp - -bin_PROGRAMS = nls_login_client nls_frontend_service - -nls_frontend_service_SOURCES = frontend_service.cpp - -nls_login_client_SOURCES = client.cpp - -nls_frontend_servicedir=$(datadir)/nel/samples/net/udp -nls_frontend_service_DATA=frontend_service.cfg - -nls_login_clientdir=$(datadir)/nel/samples/net/udp -nls_login_client_DATA=client.cfg - -AM_CXXFLAGS = -DLC_DIR="\"$(nls_login_clientdir)\"" -I$(top_srcdir)/src - -nls_frontend_service_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/net/libnelnet.la - -nls_login_client_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/net/libnelnet.la - -# End of Makefile.am - diff --git a/code/nel/samples/net/udp/Makefile.am b/code/nel/samples/net/udp/Makefile.am deleted file mode 100644 index 07a131fd8..000000000 --- a/code/nel/samples/net/udp/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005-04-13 12:37:26 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = main.dsw main.sln bench_service_8.vcproj bench_service.vcproj bench_service.dsp client_8.vcproj client.dsp client.vcproj readme.txt - -bin_PROGRAMS = udp_bench_service udp_bench_client - -udp_bench_service_SOURCES = bench_service.cpp receive_task.cpp receive_task.h - -udp_bench_client_SOURCES = client.cpp graph.cpp graph.h simlag.cpp simlag.h - -noinst_HEADERS = receive_task.h graph.h simlag.h - -udp_bench_servicedir=$(datadir)/nel/samples/net/udp -udp_bench_service_DATA= bench_service.cfg - -udp_bench_clientdir=$(datadir)/nel/samples/net/udp -udp_bench_client_DATA=client.cfg - -AM_CXXFLAGS = -DUDP_DIR="\"$(udp_bench_clientdir)\"" -I$(top_srcdir)/src - -udp_bench_service_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/net/libnelnet.la - -udp_bench_client_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/net/libnelnet.la - -# End of Makefile.am - diff --git a/code/nel/samples/pacs/Makefile.am b/code/nel/samples/pacs/Makefile.am deleted file mode 100644 index d7a552769..000000000 --- a/code/nel/samples/pacs/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = pacs_sample - -pacs_sample_SOURCES = main.cpp object.cpp object.h - -AM_CXXFLAGS = -I$(top_srcdir)/src - -pacs_sample_LDADD = ../../src/misc/libnelmisc.la \ - ../../src/3d/libnel3d.la \ - ../../src/pacs/libnelpacs.la - - -# End of Makefile.am - diff --git a/code/nel/samples/sound_sources/Makefile.am b/code/nel/samples/sound_sources/Makefile.am deleted file mode 100644 index 1e05afa90..000000000 --- a/code/nel/samples/sound_sources/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = sound_sources - -sound_sources_SOURCES = main.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -sound_sources_LDADD = ../../src/misc/libnelmisc.la \ - ../../src/sound/libnelsnd.la \ - ../../src/sound/driver/libnelsnd_lowlevel.la \ - ../../src/sound/driver/fmod/libnel_drv_fmod.la \ - ../../src/ligo/libnelligo.la \ - ../../src/georges/libnelgeorges.la \ - ../../src/3d/libnel3d.la - - -# End of Makefile.am - diff --git a/code/nel/src/3d/Makefile.am b/code/nel/src/3d/Makefile.am deleted file mode 100644 index 441c4ee47..000000000 --- a/code/nel/src/3d/Makefile.am +++ /dev/null @@ -1,616 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = driver - -lib_LTLIBRARIES = libnel3d.la - -EXTRA_DIST = mesh_mrm_skin_template.cpp mesh_mrm_skinned_template.cpp - -libnel3d_la_SOURCES = \ - anim_ctrl.cpp \ - anim_detail_trav.cpp \ - anim_detail_trav.h \ - animatable.cpp \ - animatable.h \ - animated_lightmap.cpp \ - animated_lightmap.h \ - animated_material.cpp \ - animated_material.h \ - animated_morph.cpp \ - animated_morph.h \ - animated_value.cpp \ - animated_value.h \ - animation.cpp \ - animation.h \ - animation_optimizer.cpp \ - animation_optimizer.h \ - animation_playlist.cpp \ - animation_playlist.h \ - animation_set.cpp \ - animation_set.h \ - animation_set_user.cpp \ - animation_set_user.h \ - animation_time.cpp \ - async_file_manager_3d.cpp \ - async_file_manager_3d.h \ - async_texture_block.cpp \ - async_texture_block.h \ - async_texture_manager.cpp \ - async_texture_manager.h \ - bezier_patch.cpp \ - bezier_patch.h \ - bloom_effect.cpp \ - bloom_effect.h \ - bone.cpp \ - bone.h \ - bsp_tree.h \ - camera.cpp \ - camera.h \ - camera_col.cpp \ - camera_col.h \ - channel_mixer.cpp \ - channel_mixer.h \ - clip_trav.cpp \ - clip_trav.h \ - cloud.cpp \ - cloud.h \ - cloud_scape.cpp \ - cloud_scape.h \ - cloud_scape_user.cpp \ - cloud_scape_user.h \ - cluster.cpp \ - cluster.h \ - coarse_mesh_build.cpp \ - coarse_mesh_build.h \ - coarse_mesh_manager.cpp \ - coarse_mesh_manager.h \ - computed_string.cpp \ - computed_string.h \ - cube_grid.cpp \ - cube_grid.h \ - cube_map_builder.cpp \ - cube_map_builder.h \ - debug_vb.cpp \ - debug_vb.h \ - deform_2d.cpp \ - deform_2d.h \ - driver.cpp \ - driver.h \ - driver_material_inline.h \ - driver_user.cpp \ - driver_user.h \ - driver_user2.cpp \ - dru.cpp \ - dru.h \ - event_mouse_listener.cpp \ - event_mouse_listener.h \ - fast_ptr_list.cpp \ - fast_ptr_list.h \ - fasthls_modifier.cpp \ - fasthls_modifier.h \ - flare_model.cpp \ - flare_model.h \ - flare_shape.cpp \ - flare_shape.h \ - font_generator.cpp \ - font_generator.h \ - font_manager.cpp \ - font_manager.h \ - frustum.cpp \ - heat_haze.cpp \ - heat_haze.h \ - height_map.cpp \ - hls_color_texture.cpp \ - hls_color_texture.h \ - hls_texture_bank.cpp \ - hls_texture_bank.h \ - hls_texture_manager.cpp \ - hls_texture_manager.h \ - hrc_trav.cpp \ - hrc_trav.h \ - ig_surface_light.cpp \ - ig_surface_light.h \ - ig_surface_light_build.cpp \ - ig_surface_light_build.h \ - index_buffer.cpp \ - index_buffer.h \ - init_3d.cpp \ - init_3d.h \ - instance_group_user.cpp \ - instance_group_user.h \ - instance_lighter.cpp \ - instance_lighter.h \ - key.cpp \ - key.h \ - landscape.cpp \ - landscape.h \ - landscape_collision_grid.cpp \ - landscape_collision_grid.h \ - landscape_def.cpp \ - landscape_def.h \ - landscape_face_vector_manager.cpp \ - landscape_face_vector_manager.h \ - landscape_model.cpp \ - landscape_model.h \ - landscape_profile.cpp \ - landscape_profile.h \ - landscape_user.cpp \ - landscape_user.h \ - landscape_vegetable_block.cpp \ - landscape_vegetable_block.h \ - landscapeig_manager.cpp \ - landscapevb_allocator.cpp \ - landscapevb_allocator.h \ - landscapevb_info.cpp \ - landscapevb_info.h \ - layered_ordering_table.h \ - light.cpp \ - light.h \ - light_contribution.cpp \ - light_contribution.h \ - light_influence_interpolator.cpp \ - light_influence_interpolator.h \ - light_trav.cpp \ - light_trav.h \ - light_user.cpp \ - light_user.h \ - lighting_manager.cpp \ - lighting_manager.h \ - load_balancing_trav.cpp \ - load_balancing_trav.h \ - lod_character_builder.cpp \ - lod_character_builder.h \ - lod_character_instance.cpp \ - lod_character_instance.h \ - lod_character_manager.cpp \ - lod_character_manager.h \ - lod_character_shape.cpp \ - lod_character_shape.h \ - lod_character_shape_bank.cpp \ - lod_character_shape_bank.h \ - lod_character_texture.cpp \ - lod_character_texture.h \ - logic_info.cpp \ - material.cpp \ - material.h \ - matrix_3x4.cpp \ - matrix_3x4.h \ - mesh.cpp \ - mesh.h \ - mesh_base.cpp \ - mesh_base.h \ - mesh_base_instance.cpp \ - mesh_base_instance.h \ - mesh_blender.cpp \ - mesh_blender.h \ - mesh_block_manager.cpp \ - mesh_block_manager.h \ - mesh_geom.cpp \ - mesh_geom.h \ - mesh_instance.cpp \ - mesh_instance.h \ - mesh_morpher.cpp \ - mesh_morpher.h \ - mesh_mrm.cpp \ - mesh_mrm.h \ - mesh_mrm_instance.cpp \ - mesh_mrm_instance.h \ - mesh_mrm_skin.cpp \ - mesh_mrm_skin_template.cpp \ - mesh_mrm_skinned.cpp \ - mesh_mrm_skinned.h \ - mesh_mrm_skinned_instance.cpp \ - mesh_mrm_skinned_instance.h \ - mesh_mrm_skinned_template.cpp \ - mesh_multi_lod.cpp \ - mesh_multi_lod.h \ - mesh_multi_lod_instance.cpp \ - mesh_multi_lod_instance.h \ - mesh_vertex_program.cpp \ - mesh_vertex_program.h \ - meshvp_per_pixel_light.cpp \ - meshvp_per_pixel_light.h \ - meshvp_wind_tree.cpp \ - meshvp_wind_tree.h \ - mini_col.cpp \ - mini_col.h \ - motion_blur.cpp \ - motion_blur.h \ - mrm_builder.cpp \ - mrm_builder.h \ - mrm_internal.cpp \ - mrm_internal.h \ - mrm_level_detail.cpp \ - mrm_level_detail.h \ - mrm_mesh.cpp \ - mrm_mesh.h \ - mrm_parameters.cpp \ - mrm_parameters.h \ - nelu.cpp \ - nelu.h \ - noise_3d.cpp \ - noise_3d.h \ - occlusion_query.h \ - ordering_table.h \ - packed_zone.cpp \ - packed_zone.h \ - packed_world.cpp \ - packed_world.h \ - particle_system.cpp \ - particle_system.h \ - particle_system_manager.cpp \ - particle_system_manager.h \ - particle_system_model.cpp \ - particle_system_model.h \ - particle_system_process.cpp \ - particle_system_process.h \ - particle_system_shape.cpp \ - particle_system_shape.h \ - particle_system_sound_user.cpp \ - patch.cpp \ - patch.h \ - patch_lightmap.cpp \ - patch_noise.cpp \ - patch_rdr_pass.cpp \ - patch_rdr_pass.h \ - patch_render.cpp \ - patch_vegetable.cpp \ - patchdlm_context.cpp \ - patchdlm_context.h \ - patchuv_locator.cpp \ - patchuv_locator.h \ - play_list_manager.cpp \ - play_list_manager.h \ - play_list_manager_user.cpp \ - play_list_manager_user.h \ - play_list_user.cpp \ - play_list_user.h \ - point_light.cpp \ - point_light.h \ - point_light_model.cpp \ - point_light_model.h \ - point_light_named.cpp \ - point_light_named.h \ - point_light_named_array.cpp \ - point_light_named_array.h \ - portal.cpp \ - portal.h \ - primitive_profile.cpp \ - ps_allocator.cpp \ - ps_allocator.h \ - ps_attrib.h \ - ps_attrib_maker.h \ - ps_attrib_maker_bin_op.cpp \ - ps_attrib_maker_bin_op.h \ - ps_attrib_maker_bin_op_inline.h \ - ps_attrib_maker_helper.cpp \ - ps_attrib_maker_helper.h \ - ps_attrib_maker_iterators.h \ - ps_attrib_maker_template.cpp \ - ps_attrib_maker_template.h \ - ps_color.cpp \ - ps_color.h \ - ps_direction.h \ - ps_dot.cpp \ - ps_dot.h \ - ps_edit.h \ - ps_emitter.cpp \ - ps_emitter.h \ - ps_face.cpp \ - ps_face.h \ - ps_face_look_at.cpp \ - ps_face_look_at.h \ - ps_fan_light.cpp \ - ps_fan_light.h \ - ps_float.cpp \ - ps_float.h \ - ps_force.cpp \ - ps_force.h \ - ps_int.cpp \ - ps_int.h \ - ps_iterator.h \ - ps_light.cpp \ - ps_light.h \ - ps_located.cpp \ - ps_located.h \ - ps_lod.h \ - ps_macro.h \ - ps_mesh.cpp \ - ps_mesh.h \ - ps_misc.h \ - ps_particle.cpp \ - ps_particle.h \ - ps_particle2.cpp \ - ps_particle2.h \ - ps_particle_basic.cpp \ - ps_particle_basic.h \ - ps_plane_basis.h \ - ps_plane_basis_maker.cpp \ - ps_plane_basis_maker.h \ - ps_quad.cpp \ - ps_quad.h \ - ps_register_attribs.cpp \ - ps_register_color_attribs.h \ - ps_register_emitters.cpp \ - ps_register_float_attribs.h \ - ps_register_forces.cpp \ - ps_register_int_attribs.h \ - ps_register_particles.cpp \ - ps_register_plane_basis_attribs.h \ - ps_register_zones.cpp \ - ps_ribbon.cpp \ - ps_ribbon.h \ - ps_ribbon_base.cpp \ - ps_ribbon_base.h \ - ps_ribbon_look_at.cpp \ - ps_ribbon_look_at.h \ - ps_shockwave.cpp \ - ps_shockwave.h \ - ps_spawn_info.h \ - ps_sound.cpp \ - ps_sound.h \ - ps_tail_dot.cpp \ - ps_tail_dot.h \ - ps_util.cpp \ - ps_util.h \ - ps_zone.cpp \ - ps_zone.h \ - ptr_set.cpp \ - ptr_set.h \ - quad_effect.cpp \ - quad_effect.h \ - quad_grid.cpp \ - quad_grid.h \ - quad_grid_clip_cluster.cpp \ - quad_grid_clip_cluster.h \ - quad_grid_clip_manager.cpp \ - quad_grid_clip_manager.h \ - radix_sort.cpp \ - radix_sort.h \ - raw_skin.cpp \ - raw_skin.h \ - raw_skinned.cpp \ - raw_skinned.h \ - ray_mesh.cpp \ - ray_mesh.h \ - register_3d.cpp \ - register_3d.h \ - render_trav.cpp \ - render_trav.h \ - root_model.cpp \ - root_model.h \ - scene.cpp \ - scene.h \ - scene_group.cpp \ - scene_group.h \ - scene_user.cpp \ - scene_user.h \ - scissor.cpp \ - seg_remanence.cpp \ - seg_remanence.h \ - seg_remanence_shape.cpp \ - seg_remanence_shape.h \ - shader.cpp \ - shader.h \ - shadow_map.cpp \ - shadow_map.h \ - shadow_map_manager.cpp \ - shadow_map_manager.h \ - shadow_poly_receiver.cpp \ - shadow_poly_receiver.h \ - shadow_skin.cpp \ - shadow_skin.h \ - shape.cpp \ - shape.h \ - shape_bank.cpp \ - shape_bank.h \ - shape_bank_user.cpp \ - shape_bank_user.h \ - shape_info.cpp \ - shape_info.h \ - shifted_triangle_cache.cpp \ - shifted_triangle_cache.h \ - skeleton_model.cpp \ - skeleton_model.h \ - skeleton_shape.cpp \ - skeleton_shape.h \ - skeleton_spawn_script.cpp \ - skeleton_spawn_script.h \ - skeleton_weight.cpp \ - skeleton_weight.h \ - static_quad_grid.cpp \ - static_quad_grid.h \ - std3d.cpp \ - std3d.h \ - stripifier.cpp \ - stripifier.h \ - surface_light_grid.cpp \ - surface_light_grid.h \ - tangent_space_build.cpp \ - tangent_space_build.h \ - target_anim_ctrl.cpp \ - tess_block.cpp \ - tess_block.h \ - tess_face_priority_list.cpp \ - tess_face_priority_list.h \ - tess_list.cpp \ - tess_list.h \ - tessellation.cpp \ - tessellation.h \ - text_context.cpp \ - text_context.h \ - text_context_user.cpp \ - text_context_user.h \ - texture.cpp \ - texture.h \ - texture_blank.cpp \ - texture_blank.h \ - texture_bloom.cpp \ - texture_bloom.h \ - texture_blend.cpp \ - texture_blend.h \ - texture_bump.cpp \ - texture_bump.h \ - texture_cube.cpp \ - texture_cube.h \ - texture_dlm.cpp \ - texture_dlm.h \ - texture_emboss.cpp \ - texture_emboss.h \ - texture_far.cpp \ - texture_far.h \ - texture_file.cpp \ - texture_file.h \ - texture_font.cpp \ - texture_font.h \ - texture_grouped.cpp \ - texture_grouped.h \ - texture_mem.cpp \ - texture_mem.h \ - texture_multi_file.cpp \ - texture_multi_file.h \ - texture_near.cpp \ - texture_near.h \ - texture_user.cpp \ - texture_user.h \ - tile_bank.cpp \ - tile_bank.h \ - tile_color.cpp \ - tile_color.h \ - tile_element.cpp \ - tile_element.h \ - tile_far_bank.cpp \ - tile_far_bank.h \ - tile_light_influence.cpp \ - tile_light_influence.h \ - tile_lumel.cpp \ - tile_lumel.h \ - tile_noise_map.cpp \ - tile_noise_map.h \ - tile_vegetable_desc.cpp \ - tile_vegetable_desc.h \ - track.cpp \ - track.h \ - track_bezier.h \ - track_keyframer.cpp \ - track_keyframer.h \ - track_sampled_common.cpp \ - track_sampled_common.h \ - track_sampled_quat.cpp \ - track_sampled_quat.h \ - track_sampled_quat_small_header.cpp \ - track_sampled_quat_small_header.h \ - track_sampled_vector.cpp \ - track_sampled_vector.h \ - track_tcb.h \ - transform.cpp \ - transform.h \ - transform_shape.cpp \ - transform_shape.h \ - transformable.cpp \ - transformable.h \ - trav_scene.cpp \ - trav_scene.h \ - u_bone.cpp \ - u_camera.cpp \ - u_instance.cpp \ - u_instance_material.cpp \ - u_material.cpp \ - u_particle_system_instance.cpp \ - u_point_light.cpp \ - u_shape.cpp \ - u_skeleton.cpp \ - u_transform.cpp \ - u_transformable.cpp \ - u_visual_collision_mesh.cpp \ - u_water.cpp \ - vegetable.cpp \ - vegetable.h \ - vegetable_blend_layer_model.cpp \ - vegetable_blend_layer_model.h \ - vegetable_clip_block.cpp \ - vegetable_clip_block.h \ - vegetable_def.cpp \ - vegetable_def.h \ - vegetable_instance_group.cpp \ - vegetable_instance_group.h \ - vegetable_light_ex.cpp \ - vegetable_light_ex.h \ - vegetable_manager.cpp \ - vegetable_manager.h \ - vegetable_quadrant.cpp \ - vegetable_quadrant.h \ - vegetable_shape.cpp \ - vegetable_shape.h \ - vegetable_sort_block.cpp \ - vegetable_sort_block.h \ - vegetable_uv8.cpp \ - vegetable_uv8.h \ - vegetablevb_allocator.cpp \ - vegetablevb_allocator.h \ - vertex_buffer.cpp \ - vertex_buffer.h \ - vertex_buffer_heap.cpp \ - vertex_buffer_heap.h \ - vertex_program.cpp \ - vertex_program.h \ - vertex_program_parse.cpp \ - vertex_program_parse.h \ - vertex_stream_manager.cpp \ - vertex_stream_manager.h \ - viewport.cpp \ - visual_collision_entity.cpp \ - visual_collision_entity.h \ - visual_collision_entity_user.cpp \ - visual_collision_entity_user.h \ - visual_collision_manager.cpp \ - visual_collision_manager.h \ - visual_collision_manager_user.cpp \ - visual_collision_manager_user.h \ - visual_collision_mesh.cpp \ - visual_collision_mesh.h \ - water_env_map.cpp \ - water_env_map.h \ - water_env_map_user.cpp \ - water_env_map_user.h \ - water_height_map.cpp \ - water_height_map.h \ - water_model.cpp \ - water_model.h \ - water_pool_manager.cpp \ - water_pool_manager.h \ - water_shape.cpp \ - water_shape.h \ - zone.cpp \ - zone.h \ - zone_corner_smoother.cpp \ - zone_corner_smoother.h \ - zone_lighter.cpp \ - zone_lighter.h \ - zone_manager.cpp \ - zone_manager.h \ - zone_search.cpp \ - zone_search.h \ - zone_smoother.cpp \ - zone_smoother.h \ - zone_symmetrisation.cpp \ - zone_symmetrisation.h \ - zone_tgt_smoother.cpp \ - zone_tgt_smoother.h - -noinst_HEADERS = std3d.h -# mesh_vertex_program.h meshvp_wind_tree.h - -AM_CXXFLAGS = -I$(top_srcdir)/src @FREETYPE_CFLAGS@ - -libnel3d_la_LIBADD = @FREETYPE_LIBS@ -lc -ldl -lpthread - -libnel3d_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = nel-3d.pc - -# End of Makefile.am diff --git a/code/nel/src/3d/driver/Makefile.am b/code/nel/src/3d/driver/Makefile.am deleted file mode 100644 index 0603c2362..000000000 --- a/code/nel/src/3d/driver/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = direct3d - -SUBDIRS = opengl - -# End of Makefile.am diff --git a/code/nel/src/3d/driver/opengl/Makefile.am b/code/nel/src/3d/driver/opengl/Makefile.am deleted file mode 100644 index 744801217..000000000 --- a/code/nel/src/3d/driver/opengl/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = driver_opengl_8.vcproj \ - driver_opengl.vcproj \ - driver_opengl.dsp \ - driver_opengl.def - -lib_LTLIBRARIES = libnel_drv_opengl.la - -libnel_drv_opengl_la_SOURCES = driver_opengl.cpp \ - driver_opengl.h \ - driver_opengl_extension.cpp \ - driver_opengl_extension.h \ - driver_opengl_extension_def.h \ - driver_opengl_light.cpp \ - driver_opengl_mac.cpp \ - driver_opengl_material.cpp \ - driver_opengl_matrix.cpp \ - driver_opengl_states.cpp \ - driver_opengl_states.h \ - driver_opengl_texture.cpp \ - driver_opengl_vertex.cpp \ - driver_opengl_vertex_buffer_hard.cpp \ - driver_opengl_vertex_buffer_hard.h \ - driver_opengl_vertex_program.cpp \ - stdopengl.cpp \ - stdopengl.h \ - unix_event_emitter.cpp \ - unix_event_emitter.h - - -noinst_HEADERS = stdopengl.h - -AM_CXXFLAGS = -I$(top_srcdir)/src \ - @OPENGL_CFLAGS@ @XF86VIDMODE_CFLAGS@ - -libnel_drv_opengl_la_LIBADD = @OPENGL_LIBS@ @XF86VIDMODE_LIBS@ -lXmu -libnel_drv_opengl_la_LDFLAGS = -no-undefined - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = nel-driverogl.pc - -# End of Makefile.am - diff --git a/code/nel/src/Makefile.am b/code/nel/src/Makefile.am deleted file mode 100644 index dbedcae88..000000000 --- a/code/nel/src/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -DIST_SUBDIRS = net 3d pacs sound misc georges ligo - -SUBDIRS = @NEL_SUBDIRS@ - -EXTRA_DIST = 3d.vcproj \ - georges.vcproj \ - ligo.vcproj \ - logic.vcproj \ - misc.vcproj \ - net.vcproj \ - pacs.vcproj \ - sound.vcproj - -# End of Makefile.am diff --git a/code/nel/src/Rules.mk b/code/nel/src/Rules.mk deleted file mode 100644 index cb5d3dc57..000000000 --- a/code/nel/src/Rules.mk +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################# -# A few basic default rules and intrinsic rules - -# Load objects dependencies -ifeq (Dependencies.mk,$(wildcard Dependencies.mk)) -include Dependencies.mk -check-deps: - @echo - @echo Dependencies found [OK] - @echo -else -check-deps: - @echo - @echo "No dependencies found [ERROR]" - @echo "You should try 'make update' first" - @echo - @exit 1 -endif - -# Start off by over-riding the default build rules with our own intrinsics -.SUFFIXES: -.SUFFIXES: .cpp .o -.cpp.o: - $(CXX) -c $(CXXFLAGS) $< -o $@ - -# remove object files and core (if any) -clean: - find . -name "core*" -exec $(RM) {} \; - find . -name "*.o" -exec $(RM) {} \; - find . -name "*~" -exec $(RM) {} \; - find . -name "Dependencies.mk" -exec $(RM) {} \; - -# remove object files, core dump, and executable (if any) -distclean: - $(MAKE) clean - $(RM) $(TARGETS) - $(RM) $(TARGETS)_debug - -# make the thing again from scratch -again: - $(MAKE) distclean - $(MAKE) $(TARGETS) - -UPDATE_OBJS=`cat ../$(DSP_TARGET) | grep SOURCE | sed -e 's/\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f3- | tr '\n' ' ' | sed -e 's/=/..\\\\/g' | tr '\n' ' ' | sed -e 's/\\\\/\\//g' | sed -e 's/\.cpp /\.o /g'` - -UPDATE_SRCS=`cat ../$(DSP_TARGET) | grep SOURCE | sed -e 's/\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f3- | tr '\n' ' ' | sed -e 's/=/..\\\\/g' | tr '\n' ' ' | sed -e 's/\\\\/\\//g'` - -dep: update - -update: - ../gen_deps.sh $(CXX) $(CXXFLAGS) -- $(UPDATE_SRCS) > Dependencies.mk - echo "OBJS=$(UPDATE_OBJS)" > Objects.mk - -touch: - $(RM) $(TARGETS) - $(RM) $(TARGETS)_debug diff --git a/code/nel/src/Variables.mk b/code/nel/src/Variables.mk deleted file mode 100644 index 216b4b1c8..000000000 --- a/code/nel/src/Variables.mk +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################# -# Setting up the global compiler settings... - -# The names of the executables -CXX = c++ -RM = rm -f -MAKE = make - -DBG = off - -FLAGS_CMN = -g -pipe -Wno-ctor-dtor-privacy -Wno-multichar -D_REENTRANT -DHAVE_X86 - -FLAGS_DBG_on = -O0 -finline-functions -DNL_DEBUG -DNL_DEBUG_FAST -FLAGS_DBG_off = -O3 -ftemplate-depth-24 -funroll-loops -DNL_RELEASE_DEBUG -DIR_DBG_on = debug -DIR_DBG_off = release - -ifeq (Objects.mk,$(wildcard Objects.mk)) -include Objects.mk -endif diff --git a/code/nel/src/cegui/Makefile.am b/code/nel/src/cegui/Makefile.am deleted file mode 100644 index 43786d8e8..000000000 --- a/code/nel/src/cegui/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# -# $Id: Makefile.am,v 1.7 2002-06-10 17:02:05 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -lib_LTLIBRARIES = libnelceguirenderer.la - -libnelceguirenderer_la_SOURCES = nelrenderer.cpp nelresourceprovider.cpp neltexture.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src @CEGUI_CFLAGS@ - -libnelceguirenderer_la_LIBADD = -lc -lpthread @CEGUI_LIBS@ - -libnelceguirenderer_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - - -# End of Makefile.am - diff --git a/code/nel/src/gen_deps.sh b/code/nel/src/gen_deps.sh deleted file mode 100755 index 45f41e17f..000000000 --- a/code/nel/src/gen_deps.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -command='' -sources='' -phase=0 -for arg in $* -do - if [ "$phase" == 0 ] && [ "$arg" == '--' ] - then - phase=1 - elif [ "$phase" == 0 ] - then - command="$command $arg" - elif [ "$phase" == 1 ] - then - sources="$sources $arg" - fi -done - -for src in $sources -do - obj=`echo $src | sed -e 's/.cpp$/.o/'` - $command -MT $obj -M $src -done - diff --git a/code/nel/src/georges/Makefile.am b/code/nel/src/georges/Makefile.am deleted file mode 100644 index 389110b9f..000000000 --- a/code/nel/src/georges/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = georges_file_format.txt - -lib_LTLIBRARIES = libnelgeorges.la - -libnelgeorges_la_SOURCES = form.cpp \ - form.h \ - form_loader.cpp \ - form_loader.h \ - form_dfn.cpp \ - form_dfn.h \ - form_elm.cpp \ - form_elm.h \ - stdgeorges.cpp \ - stdgeorges.h \ - header.cpp \ - header.h \ - load_form.cpp \ - type.cpp \ - type.h - -AM_CXXFLAGS = -I$(top_srcdir)/src - -libnelgeorges_la_LIBADD = -lc -lpthread - -libnelgeorges_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - - -# End of Makefile.am - diff --git a/code/nel/src/ligo/Makefile.am b/code/nel/src/ligo/Makefile.am deleted file mode 100644 index db6e5d423..000000000 --- a/code/nel/src/ligo/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -lib_LTLIBRARIES = libnelligo.la - -libnelligo_la_SOURCES = ligo_config.cpp \ - ligo_error.cpp \ - ligo_error.h \ - ligo_material.cpp \ - ligo_material.h \ - primitive.cpp \ - primitive_class.cpp \ - primitive_configuration.cpp \ - transition.cpp \ - transition.h \ - zone_bank.cpp \ - zone_bank.h \ - zone_edge.cpp \ - zone_edge.h \ - zone_region.cpp \ - zone_region.h \ - zone_template.cpp \ - zone_template.h \ - primitive_utils.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -libnelligo_la_LIBADD = -lc -lpthread - -libnelligo_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - - -# End of Makefile.am - diff --git a/code/nel/src/misc/Makefile.am b/code/nel/src/misc/Makefile.am deleted file mode 100644 index 345a210c4..000000000 --- a/code/nel/src/misc/Makefile.am +++ /dev/null @@ -1,142 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = config_file - -lib_LTLIBRARIES = libnelmisc.la - -libnelmisc_la_SOURCES = \ - aabbox.cpp \ - app_context.cpp \ - algo.cpp \ - async_file_manager.cpp \ - big_file.cpp \ - bit_mem_stream.cpp \ - bit_set.cpp \ - bitmap.cpp \ - bitmap_jpeg.cpp \ - bitmap_png.cpp \ - block_memory.cpp \ - bsphere.cpp \ - buf_fifo.cpp \ - class_id.cpp \ - class_registry.cpp \ - command.cpp \ - common.cpp \ - contiguous_block_allocator.cpp \ - cpu_time_stat.cpp \ - debug.cpp \ - di_event_emitter.cpp \ - di_game_device.cpp \ - di_game_device.h \ - di_keyboard_device.cpp \ - di_keyboard_device.h \ - di_mouse_device.cpp \ - di_mouse_device.h \ - diff_tool.cpp \ - displayer.cpp \ - eid_translator.cpp \ - entity_id.cpp \ - eval_num_expr.cpp \ - event_emitter.cpp \ - event_emitter_multi.cpp \ - event_listener.cpp \ - event_server.cpp \ - events.cpp \ - fast_floor.cpp \ - fast_mem.cpp \ - file.cpp \ - fixed_size_allocator.cpp \ - game_device.cpp \ - game_device_events.cpp \ - geom_ext.cpp \ - grid_traversal.cpp \ - gtk_displayer.cpp \ - heap_memory.cpp \ - hierarchical_timer.cpp \ - i18n.cpp \ - i_xml.cpp \ - input_device.cpp \ - input_device_server.cpp \ - keyboard_device.cpp \ - line.cpp \ - log.cpp \ - matrix.cpp \ - md5.cpp \ - mem_displayer.cpp \ - mem_stream.cpp \ - mouse_smoother.cpp \ - mutex.cpp \ - noise_value.cpp \ - o_xml.cpp \ - object_arena_allocator.cpp \ - object_vector.cpp \ - p_thread.cpp \ - path.cpp \ - plane.cpp \ - polygon.cpp \ - progress_callback.cpp \ - quad.cpp \ - quat.cpp \ - reader_writer.cpp \ - rect.cpp \ - report.cpp \ - rgba.cpp \ - sha1.cpp \ - shared_memory.cpp \ - sheet_id.cpp \ - smart_ptr.cpp \ - stdmisc.cpp \ - stdmisc.h \ - stl_block_allocator.cpp \ - stl_block_list.cpp \ - stop_watch.cpp \ - stream.cpp \ - string_common.cpp \ - string_id_array.cpp \ - string_mapper.cpp \ - system_info.cpp \ - system_utils.cpp \ - task_manager.cpp \ - tds.cpp \ - time_nl.cpp \ - triangle.cpp \ - uv.cpp \ - unicode.cpp \ - value_smoother.cpp \ - variable.cpp \ - vector.cpp \ - vector_2d.cpp \ - vector_2f.cpp \ - vector_h.cpp \ - vectord.cpp \ - win_displayer.cpp \ - win_event_emitter.cpp \ - win_thread.cpp \ - window_displayer.cpp \ - words_dictionary.cpp \ - dynloadlib.cpp \ - sstring.cpp \ - co_task.cpp \ - xml_pack.cpp \ - inter_window_msg_queue.cpp \ - win32_util.cpp - - -noinst_HEADERS = di_game_device.h \ - di_keyboard_device.h \ - di_mouse_device.h \ - stdmisc.h - - -libnelmisc_la_LIBADD = config_file/libconfig.la -lc -lpthread -lrt -ldl -lpng -ljpeg - -libnelmisc_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = nel-misc.pc - -# End of Makefile.am - diff --git a/code/nel/src/misc/config_file/Makefile.am b/code/nel/src/misc/config_file/Makefile.am deleted file mode 100644 index ee72fe42c..000000000 --- a/code/nel/src/misc/config_file/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -noinst_LTLIBRARIES = libconfig.la - -AM_YFLAGS = --defines=cf_gramatical.h -p cf - -AM_LFLAGS = -f -8 -Pcf -olex.yy.c - -EXTRA_DIST = cf_gramatical.h cf_bison.simple cf_flex.skl do.bat - -libconfig_la_SOURCES = cf_lexical.lpp \ - cf_gramatical.ypp \ - config_file.cpp - -#libconfig_la_SOURCES = config_file.cpp - -# End of Makefile.am - diff --git a/code/nel/src/net/Makefile.am b/code/nel/src/net/Makefile.am deleted file mode 100644 index ef0d956be..000000000 --- a/code/nel/src/net/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -lib_LTLIBRARIES = libnelnet.la - -libnelnet_la_SOURCES = buf_client.cpp \ - buf_net_base.cpp \ - buf_server.cpp \ - buf_sock.cpp \ - callback_client.cpp \ - callback_net_base.cpp \ - callback_server.cpp \ - dummy_tcp_sock.cpp \ - inet_address.cpp \ - listen_sock.cpp \ - login_client.cpp \ - login_cookie.cpp \ - login_server.cpp \ - message.cpp \ - message_recorder.cpp \ - naming_client.cpp \ - net_displayer.cpp \ - net_log.cpp \ - service.cpp \ - sock.cpp \ - tcp_sock.cpp \ - udp_sock.cpp \ - udp_sim_sock.cpp \ - unitime.cpp \ - unified_network.cpp \ - varpath.cpp \ - transport_class.cpp \ - email.cpp \ - admin.cpp \ - stdin_monitor_thread.cpp \ - stdin_monitor_thread.h \ - module.cpp \ - module_common.cpp \ - module_gateway.cpp \ - module_manager.cpp \ - module_message.cpp \ - module_socket.cpp \ - module_gateway_transport.cpp \ - module_l5_transport.cpp \ - module_local_gateway.cpp \ - stdnet.cpp - -noinst_HEADERS = stdnet.h - -AM_CXXFLAGS = -I$(top_srcdir)/src - -libnelnet_la_LIBADD = -lc -lpthread - -libnelnet_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - - -# End of Makefile.am - diff --git a/code/nel/src/pacs/Makefile.am b/code/nel/src/pacs/Makefile.am deleted file mode 100644 index 0b05a2ed6..000000000 --- a/code/nel/src/pacs/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -lib_LTLIBRARIES = libnelpacs.la - -libnelpacs_la_SOURCES = chain.cpp \ - chain.h \ - chain_quad.cpp \ - chain_quad.h \ - collision_callback.cpp \ - collision_callback.h \ - collision_desc.cpp \ - collision_desc.h \ - collision_mesh_build.h \ - collision_ot.cpp \ - collision_ot.h \ - collision_surface_temp.cpp \ - collision_surface_temp.h \ - edge_collide.cpp \ - edge_collide.h \ - edge_quad.cpp \ - edge_quad.h \ - exterior_mesh.cpp \ - exterior_mesh.h \ - global_retriever.cpp \ - global_retriever.h \ - local_retriever.cpp \ - local_retriever.h \ - move_cell.cpp \ - move_cell.h \ - move_container.cpp \ - move_container.h \ - move_container_inline.h \ - move_element.cpp \ - move_element.h \ - move_element_inline.h \ - move_primitive.cpp \ - move_primitive.h \ - primitive_world_image.cpp \ - primitive_world_image.h \ - primitive_block_pacs.cpp \ - primitive_block.h \ - retrievable_surface.cpp \ - retrievable_surface.h \ - retriever_bank.cpp \ - retriever_bank.h \ - retriever_instance.cpp \ - retriever_instance.h \ - stdpacs.cpp \ - surface_quad.cpp \ - surface_quad.h \ - vector_2s.cpp \ - vector_2s.h \ - build_indoor.cpp \ - build_indoor.h - -AM_CXXFLAGS = -I$(top_srcdir)/src - -noinst_HEADERS = stdpacs.h face_grid.h quad_grid.h - -libnelpacs_la_LIBADD = -lc - -libnelpacs_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - - -# End of Makefile.am - diff --git a/code/nel/src/sound/Makefile.am b/code/nel/src/sound/Makefile.am deleted file mode 100644 index b919e10c4..000000000 --- a/code/nel/src/sound/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = driver - -lib_LTLIBRARIES = libnelsnd.la - -libnelsnd_la_SOURCES = async_file_manager_sound.cpp \ - async_file_manager_sound.h \ - audio_mixer_user.cpp \ - audio_mixer_user.h \ - background_sound.cpp \ - background_sound.h \ - background_sound_manager.cpp \ - background_sound_manager.h \ - background_source.cpp \ - background_source.h \ - clustered_sound.cpp \ - clustered_sound.h \ - complex_sound.cpp \ - complex_sound.h \ - complex_source.cpp \ - complex_source.h \ - context_sound.cpp \ - context_sound.h \ - listener_user.cpp \ - listener_user.h \ - mixing_track.cpp \ - mixing_track.h \ - music_channel_fader.h \ - music_channel_fader.cpp \ - music_sound.cpp \ - music_sound.h \ - music_sound_manager.cpp \ - music_sound_manager.h \ - music_source.cpp \ - music_source.h \ - sample_bank.cpp \ - sample_bank.h \ - sample_bank_manager.cpp \ - sample_bank_manager.h \ - simple_sound.cpp \ - simple_sound.h \ - simple_source.cpp \ - simple_source.h \ - sound_animation.cpp \ - sound_anim_manager.cpp \ - sound_anim_marker.cpp \ - sound_bank.cpp \ - sound_bank.h \ - sound.cpp \ - sound.h \ - sound_pattern.h \ - source_common.cpp \ - source_common.h \ - stdsound.cpp \ - stdsound.h \ - stream_source.cpp \ - stream_source.h \ - stream_sound.cpp \ - stream_sound.h - -AM_CXXFLAGS = -I$(top_srcdir)/src - -noinst_HEADERS = stdsound.h - -libnelsnd_la_LIBADD = driver/libnelsnd_lowlevel.la - -libnelsnd_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - - -# End of Makefile.am - diff --git a/code/nel/src/sound/driver/Makefile.am b/code/nel/src/sound/driver/Makefile.am deleted file mode 100644 index 0e7325b29..000000000 --- a/code/nel/src/sound/driver/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = fmod openal dsound - -SUBDIRS = @SOUND_SUBDIRS@ - -noinst_LTLIBRARIES = libnelsnd_lowlevel.la - -libnelsnd_lowlevel_la_SOURCES = buffer.cpp \ - buffer.h \ - effect.h \ - effect.cpp \ - listener.cpp \ - listener.h \ - sound_driver.cpp \ - sound_driver.h \ - source.cpp \ - source.h - -AM_CXXFLAGS = -I$(top_srcdir)/src - -# End of Makefile.am - diff --git a/code/nel/src/sound/driver/fmod/Makefile.am b/code/nel/src/sound/driver/fmod/Makefile.am deleted file mode 100644 index 505c77173..000000000 --- a/code/nel/src/sound/driver/fmod/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -lib_LTLIBRARIES = libnel_drv_fmod.la - -libnel_drv_fmod_la_SOURCES = buffer_fmod.cpp \ - buffer_fmod.h \ - listener_fmod.cpp \ - listener_fmod.h \ - music_channel_fmod.cpp \ - music_channel_fmod.h \ - sound_driver_fmod.cpp \ - sound_driver_fmod.h \ - source_fmod.cpp \ - source_fmod.h \ - stdfmod.cpp \ - stdfmod.h - - -AM_CXXFLAGS = -I$(top_srcdir)/src @FMOD_CFLAGS@ - -noinst_HEADERS = stdfmod.h - -libnel_drv_fmod_la_LIBADD = @FMOD_LIBS@ - -libnel_drv_fmod_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - - -# End of Makefile.am - diff --git a/code/nel/src/sound/driver/openal/Makefile.am b/code/nel/src/sound/driver/openal/Makefile.am deleted file mode 100644 index 559a26370..000000000 --- a/code/nel/src/sound/driver/openal/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = driver_openal.def driver_openal.dsp driver_openal.vcproj - -lib_LTLIBRARIES = libnel_drv_openal.la - -libnel_drv_openal_la_SOURCES = buffer_al.cpp \ - buffer_al.h \ - listener_al.cpp \ - listener_al.h \ - sound_driver_al.cpp \ - sound_driver_al.h \ - source_al.cpp \ - source_al.h \ - stdopenal.h - -AM_CXXFLAGS = -I$(top_srcdir)/src @OPENAL_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ - -noinst_HEADERS = stdopenal.h - -libnel_drv_openal_la_LIBADD = @OPENAL_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@ - -libnel_drv_openal_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/Makefile.am b/code/nel/tools/3d/Makefile.am deleted file mode 100644 index 7cde91464..000000000 --- a/code/nel/tools/3d/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# -# $Id: Makefile.am,v 1.2 2002/05/14 13:33:59 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -DIST_SUBDIRS = build_coarse_mesh \ - build_far_bank \ - build_smallbank \ - ig_lighter_lib \ - ig_lighter \ - panoply_maker \ - zone_lib \ - zone_dependencies \ - zone_ig_lighter \ - zone_lighter \ - zone_welder - -SUBDIRS = build_coarse_mesh \ - build_far_bank \ - build_smallbank \ - ig_lighter_lib \ - ig_lighter \ - zone_lib \ - zone_dependencies \ - zone_ig_lighter \ - zone_lighter \ - zone_welder - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/build_coarse_mesh/Makefile.am b/code/nel/tools/3d/build_coarse_mesh/Makefile.am deleted file mode 100644 index b161e1b59..000000000 --- a/code/nel/tools/3d/build_coarse_mesh/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = build.cfg \ - build_coarse_mesh.dsp - -bin_PROGRAMS = build_coarse_mesh - -build_coarse_mesh_SOURCES = build_coarse_mesh.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -build_coarse_mesh_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/build_far_bank/Makefile.am b/code/nel/tools/3d/build_far_bank/Makefile.am deleted file mode 100644 index 9dd0eadec..000000000 --- a/code/nel/tools/3d/build_far_bank/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = build_far_bank.dsp - -bin_PROGRAMS = build_far_bank - -build_far_bank_SOURCES = build_far_bank.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -build_far_bank_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/build_smallbank/Makefile.am b/code/nel/tools/3d/build_smallbank/Makefile.am deleted file mode 100644 index f70258cb6..000000000 --- a/code/nel/tools/3d/build_smallbank/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = build_smallbank.dsp - -bin_PROGRAMS = build_smallbank - -build_smallbank_SOURCES = build_smallbank.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -build_smallbank_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/ig_lighter/Makefile.am b/code/nel/tools/3d/ig_lighter/Makefile.am deleted file mode 100644 index ccde76fd0..000000000 --- a/code/nel/tools/3d/ig_lighter/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = config.cfg \ - ig_lighter.dsp - -bin_PROGRAMS = ig_lighter - -ig_lighter_SOURCES = ig_lighter.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -ig_lighter_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la \ - ../../../src/pacs/libnelpacs.la \ - ../ig_lighter_lib/libig_lighter.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/ig_lighter_lib/Makefile.am b/code/nel/tools/3d/ig_lighter_lib/Makefile.am deleted file mode 100644 index e66b9a94b..000000000 --- a/code/nel/tools/3d/ig_lighter_lib/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = ig_lighter_lib.dsp - -noinst_LTLIBRARIES = libig_lighter.la - -libig_lighter_la_SOURCES = ig_lighter_lib.cpp - -noinst_HEADERS = ig_lighter_lib.h - -AM_CXXFLAGS = -I$(top_srcdir)/src - -libig_lighter_la_LIBADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la \ - ../../../src/pacs/libnelpacs.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/panoply_maker/Makefile.am b/code/nel/tools/3d/panoply_maker/Makefile.am deleted file mode 100644 index d821ed109..000000000 --- a/code/nel/tools/3d/panoply_maker/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = panoply.cfg \ - panoply_maker.dsp - -bin_PROGRAMS = panoply_maker - -panoply_maker_SOURCES = color_modifier.cpp hls_bank_texture_info.cpp \ - panoply_maker.cpp - -noinst_HEADERS = color_mask.h \ - color_modifier.h - -AM_CXXFLAGS = -I$(top_srcdir)/src - -panoply_maker_LDADD = ../../../src/misc/libnelmisc.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/zone_dependencies/Makefile.am b/code/nel/tools/3d/zone_dependencies/Makefile.am deleted file mode 100644 index 6563d9011..000000000 --- a/code/nel/tools/3d/zone_dependencies/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = zone_dependencies.dsp - -bin_PROGRAMS = zone_dependencies - -zone_dependencies_SOURCES = zone_dependencies.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -zone_dependencies_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la \ - ../../../src/georges/libnelgeorges.la \ - ../zone_lib/libzone.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/zone_ig_lighter/Makefile.am b/code/nel/tools/3d/zone_ig_lighter/Makefile.am deleted file mode 100644 index 79d13da15..000000000 --- a/code/nel/tools/3d/zone_ig_lighter/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = zone_ig_lighter.dsp - -bin_PROGRAMS = zone_ig_lighter - -zone_ig_lighter_SOURCES = zone_ig_lighter.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -zone_ig_lighter_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la \ - ../zone_lib/libzone.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/zone_lib/Makefile.am b/code/nel/tools/3d/zone_lib/Makefile.am deleted file mode 100644 index e3e6927a2..000000000 --- a/code/nel/tools/3d/zone_lib/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -noinst_LTLIBRARIES = libzone.la - -libzone_la_SOURCES = zone_utility.cpp - -noinst_HEADERS = zone_utility.h - -AM_CXXFLAGS = -I$(top_srcdir)/src - -libzone_la_LIBADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/zone_lighter/Makefile.am b/code/nel/tools/3d/zone_lighter/Makefile.am deleted file mode 100644 index 3d70c71b4..000000000 --- a/code/nel/tools/3d/zone_lighter/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = zone_lighter.dsp - -bin_PROGRAMS = zone_lighter - -zone_lighter_SOURCES = zone_lighter.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -zone_lighter_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la \ - ../../../src/georges/libnelgeorges.la \ - ../zone_lib/libzone.la - - -# End of Makefile.am - diff --git a/code/nel/tools/3d/zone_welder/Makefile.am b/code/nel/tools/3d/zone_welder/Makefile.am deleted file mode 100644 index c405a7fa5..000000000 --- a/code/nel/tools/3d/zone_welder/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002/05/13 15:44:58 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = zwelder.cfg \ - zone_welder.dsp - -bin_PROGRAMS = zone_welder - -zone_welder_SOURCES = internal_weld.cpp zone_welder.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -zone_welder_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la \ - ../zone_lib/libzone.la - - -# End of Makefile.am - diff --git a/code/nel/tools/Makefile.am b/code/nel/tools/Makefile.am deleted file mode 100644 index 1dba72e96..000000000 --- a/code/nel/tools/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# -# $Id: Makefile.am,v 1.2 2002/05/14 13:33:59 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = 3d misc pacs - - -# End of Makefile.am - diff --git a/code/nel/tools/misc/Makefile.am b/code/nel/tools/misc/Makefile.am deleted file mode 100644 index deb976b76..000000000 --- a/code/nel/tools/misc/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# -# $Id: Makefile.am,v 1.2 2002-05-14 13:33:59 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = bnp_make \ - disp_sheet_id \ - make_sheet_id \ - xml_packer - -# End of Makefile.am - diff --git a/code/nel/tools/misc/bnp_make/Makefile.am b/code/nel/tools/misc/bnp_make/Makefile.am deleted file mode 100644 index bdd7c4ad0..000000000 --- a/code/nel/tools/misc/bnp_make/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = bnp_make.dsw bnp_make.dsp bnp_make_8.vcproj - -bin_PROGRAMS = bnp_make - -bnp_make_SOURCES = main.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -bnp_make_LDADD = ../../../src/misc/libnelmisc.la - - -# End of Makefile.am - diff --git a/code/nel/tools/misc/disp_sheet_id/Makefile.am b/code/nel/tools/misc/disp_sheet_id/Makefile.am deleted file mode 100644 index 10fa02c10..000000000 --- a/code/nel/tools/misc/disp_sheet_id/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = disp_sheet_id.dsp disp_sheet_id_8.vcproj disp_sheet_id.dsw disp_sheet_id.sln disp_sheet_id.vcproj - -bin_PROGRAMS = disp_sheet_id - -disp_sheet_id_SOURCES = main.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -disp_sheet_id_LDADD = ../../../src/misc/libnelmisc.la - - -# End of Makefile.am - diff --git a/code/nel/tools/misc/make_sheet_id/Makefile.am b/code/nel/tools/misc/make_sheet_id/Makefile.am deleted file mode 100644 index 37e8c7ee7..000000000 --- a/code/nel/tools/misc/make_sheet_id/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = make_sheet_id.dsp make_sheet_id.dsw - -bin_PROGRAMS = make_sheet_id - -make_sheet_id_SOURCES = make_sheet_id.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -make_sheet_id_LDADD = ../../../src/misc/libnelmisc.la - - -# End of Makefile.am - diff --git a/code/nel/tools/misc/xml_packer/Makefile.am b/code/nel/tools/misc/xml_packer/Makefile.am deleted file mode 100644 index 80c40b6ea..000000000 --- a/code/nel/tools/misc/xml_packer/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = xml_packer.dsp - -bin_PROGRAMS = xml_packer - -xml_packer_SOURCES = xml_packer.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -xml_packer_LDADD = ../../../src/misc/libnelmisc.la - -# End of Makefile.am - diff --git a/code/nel/tools/pacs/Makefile.am b/code/nel/tools/pacs/Makefile.am deleted file mode 100644 index e987c21e2..000000000 --- a/code/nel/tools/pacs/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -# -# $Id: Makefile.am,v 1.2 2002-05-14 13:33:59 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = build_ig_boxes build_indoor_rbank build_rbank - -# End of Makefile.am - diff --git a/code/nel/tools/pacs/build_ig_boxes/Makefile.am b/code/nel/tools/pacs/build_ig_boxes/Makefile.am deleted file mode 100644 index e10aa1312..000000000 --- a/code/nel/tools/pacs/build_ig_boxes/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = build_ig_boxes.dsp - -bin_PROGRAMS = build_ig_boxes - -build_ig_boxes_SOURCES = main.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -build_ig_boxes_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/3d/libnel3d.la \ - ../../../src/pacs/libnelpacs.la - - -# End of Makefile.am - diff --git a/code/nel/tools/pacs/build_indoor_rbank/Makefile.am b/code/nel/tools/pacs/build_indoor_rbank/Makefile.am deleted file mode 100644 index cc116a336..000000000 --- a/code/nel/tools/pacs/build_indoor_rbank/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = build_indoor_rbank.dsp - -bin_PROGRAMS = build_indoor_rbank - -build_indoor_rbank_SOURCES = build_surfaces.cpp main.cpp mouline.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -build_indoor_rbank_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/pacs/libnelpacs.la - - -# End of Makefile.am - diff --git a/code/nel/tools/pacs/build_rbank/Makefile.am b/code/nel/tools/pacs/build_rbank/Makefile.am deleted file mode 100644 index 17b299997..000000000 --- a/code/nel/tools/pacs/build_rbank/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# -# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = build_rbank.dsp - -bin_PROGRAMS = build_rbank - -build_rbank_SOURCES = build_rbank.cpp build_surf.cpp main.cpp prim_checker.cpp \ - surface_splitter.cpp - -AM_CXXFLAGS = -I$(top_srcdir)/src - -build_rbank_LDADD = ../../../src/misc/libnelmisc.la \ - ../../../src/pacs/libnelpacs.la \ - ../../../src/ligo/libnelligo.la \ - ../../../src/3d/libnel3d.la - - -# End of Makefile.am - diff --git a/code/nelns/Makefile.am b/code/nelns/Makefile.am deleted file mode 100644 index 0bf41acd3..000000000 --- a/code/nelns/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# -# $Id: Makefile.am,v 1.9 2002/10/21 10:19:03 lecroart Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in configure config.guess missing \ - config.sub ltconfig aclocal.m4 config.h.in \ - install-sh mkinstalldirs depcomp $(DISTCLEANFILES) - -DISTCLEANFILES = stamp-h.in config.cache config.log config.status - -EXTRA_DIST = acconfig.h services.dsw bootstrap doc - -SUBDIRS = login_service \ - naming_service \ - admin_executor_service \ - admin_service \ - welcome_service - -dist-hook: - find $(distdir) -name CVS -print | xargs rm -fr - find $(distdir) -name .svn -print | xargs rm -fr - -# End of Makefile.am diff --git a/code/nelns/acinclude.m4 b/code/nelns/acinclude.m4 deleted file mode 100644 index 3c49b8f0b..000000000 --- a/code/nelns/acinclude.m4 +++ /dev/null @@ -1,1217 +0,0 @@ -# ========================================================================= -# -# Macros used by Nevrax in configure.in files. -# -# $Id: acinclude.m4,v 1.20 2005/04/04 10:07:29 cado Exp $ -# -# ========================================================================= - -# ========================================================================= -# WARNING: The original version of this file is placed in the $CVSROOT/code -# directory. -# There is links in the $CVSROOT/code sub-directories to that file -# (ex: $CVSROOT/code/nel), so be careful of the consequences of -# any modification of that file. -# ========================================================================= - -# ========================================================================= -# Macros available in that file. -# -# -# AM_NEL_DEBUG -# -# Option: none. -# Description: manage the different debug and the release mode by setting -# correctly the CFLAGS and CXXFLAGS variables. -# -# -# AM_PATH_NEL -# -# Option: none. -# Description: check the instalation of the NeL library and set the -# CXXFLAGS and LIBS variables to use it. -# -# -# AM_PATH_OPENGL -# -# Option: "yes" if the use of the OpenGL library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# OPENGL_CFLAGS and OPENGL_LIBS variables to use it. -# -# -# AM_PATH_FREETYPE -# -# Option: "yes" if the use of the Freetype library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# FREETYPE_CFLAGS and FREETYPE_LIBS variables to use it. -# -# -# AM_PATH_XF86VIDMODE -# -# Option: none. -# Description: check the instalation of the OpenGL library and set the -# XF86VIDMODE_CFLAGS and XF86VIDMODE_LIBS variables to use it. -# -# -# AM_PATH_OPENAL -# -# Option: "yes" if the use of the OpenAL library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# OPENAL_CFLAGS and OPENAL_LIBS variables to use it. -# -# -# AM_PATH_PYTHON -# -# Option: "yes" if the use of the Python library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# PYTHON_CFLAGS and PYTHON_LIBS variables to use it. -# -# ========================================================================= - - -# ========================================================================= -# AM_NEL_DEBUG - -AC_DEFUN([AM_NEL_DEBUG], -[ - -MAX_C_OPTIMIZE="-O6" - -STL_DEBUG="-D__STL_DEBUG" - -NL_DEBUG="-DNL_DEBUG" -NL_RELEASE="-DNL_RELEASE" - -AC_ARG_WITH(debug, - [ --with-debug[=full|medium|fast] - Build a debug version (huge libraries). - Full mode set only NeL and STL debug flags. - Medium mode set NeL debug flags with inline - optimization (default mode). - Fast mode is like the Medium mode with some basic - optimization. - --without-debug Build without debugging code (default)], - [with_debug=$withval], - [with_debug=no]) - -# Build optimized or debug version ? -# First check for gcc and g++ -if test "$ac_cv_prog_gcc" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" - OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" -else - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="" - OPTIMIZE_CFLAGS="" -fi - -if test "$ac_cv_prog_cxx_g" = "yes" -then - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="-O" - OPTIMIZE_CXXFLAGS="-O3" - OPTIMIZE_INLINE_CXXFLAGS="-finline-functions" -else - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="" - OPTIMIZE_INLINE_CXXFLAGS="" -fi - -if test "$with_debug" = "yes" -o "$with_debug" = "medium" -then - # Medium debug. Inline optimization - CFLAGS="$DEBUG_CFLAGS $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS" -else - if test "$with_debug" = "full" - then - # Full debug. Very slow in some cases - CFLAGS="$DEBUG_CFLAGS $NL_DEBUG $STL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $NL_DEBUG $STL_DEBUG $CXXFLAGS" - else - if test "$with_debug" = "fast" - then - # Fast debug. - CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS" - else - # Optimized version. No debug - CFLAGS="$OPTIMIZE_CFLAGS $NL_RELEASE $CFLAGS" - CXXFLAGS="$OPTIMIZE_CXXFLAGS $NL_RELEASE $CXXFLAGS" - fi - fi -fi - -# AC_MSG_RESULT([CFLAGS = $CFLAGS]) -# AC_MSG_RESULT([CXXGLAGS = $CXXFLAGS]) - -]) - - -# ========================================================================= -# MY_NEL_HEADER_CHK : NeL header files checking macros - -AC_DEFUN([MY_NEL_HEADER_CHK], -[ AC_REQUIRE_CPP() - -chk_message_obj="$1" -header="$2" -macro="$3" -is_mandatory="$4" - -if test $is_mandatory = "yes" -then - - _CPPFLAGS="$CPPFLAGS" - - CPPFLAGS="$CXXFLAGS $NEL_CFLAGS" - - AC_MSG_CHECKING(for $header) - - AC_EGREP_CPP( yo_header, -[#include <$header> -#ifdef $macro - yo_header -#endif], - have_header="yes", - have_header="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_header" = "yes" - then - AC_MSG_RESULT(yes) - else - if test "$is_mandatory" = "yes" - then - AC_MSG_ERROR([$chk_message_obj must be installed (http://www.nevrax.org).]) - else - AC_MSG_RESULT(no) - fi - fi -fi - - -]) - - -# ========================================================================= -# MY_NEL_LIB_CHK : NeL library checking macros - -AC_DEFUN([MY_NEL_LIB_CHK], -[ AC_REQUIRE_CPP() - -chk_message_obj="$1" -nel_test_lib="$2" -is_mandatory="$3" - -if test $is_mandatory = "yes" -then - - AC_CHECK_LIB($nel_test_lib, main,,[AC_MSG_ERROR([$chk_message_obj must be installed (http://www.nevrax.org).])]) -fi -]) - - -# ========================================================================= -# AM_PATH_NEL : NeL checking macros -AC_DEFUN([AM_PATH_NEL], -[ AC_REQUIRE_CPP() - -AC_ARG_WITH( nel, - [ --with-nel= path to the NeL install files directory. - e.g. /usr/local/nel]) - -AC_ARG_WITH( nel-include, - [ --with-nel-include= - path to the NeL header files directory. - e.g. /usr/local/nel/include]) - -AC_ARG_WITH( nel-lib, - [ --with-nel-lib= - path to the NeL library files directory. - e.g. /usr/local/nel/lib]) - - -nelmisc_is_mandatory="$1" -nelnet_is_mandatory="$2" -nel3d_is_mandatory="$3" -nelpacs_is_mandatory="$4" -nelsound_is_mandatory="$5" -nelai_is_mandatory="$6" -nelgeorges_is_mandatory="$7" - -# Check for nel-config -AC_PATH_PROG(NEL_CONFIG, nel-config, no) - -# -# Configure options (--with-nel*) have precendence -# over nel-config only set variables if they are not -# specified -# -if test "$NEL_CONFIG" != "no" -then - if test -z "$with_nel" -a -z "$with_nel_include" - then - CXXFLAGS="$CXXFLAGS `nel-config --cflags`" - fi - - if test -z "$with_nel" -a -z "$with_nel_lib" - then - LDFLAGS="`nel-config --ldflags` $LDFLAGS" - fi -fi - -# -# Set nel_libraries and nel_includes according to -# user specification (--with-nel*) if any. -# --with-nel-include and --with-nel-lib have precendence -# over --with-nel -# -if test "$with_nel" = "no" -then - # The user explicitly disabled the use of the NeL - AC_MSG_ERROR([NeL is mandatory: do not specify --without-nel]) -else - if test "$with_nel" -a "$with_nel" != "yes" - then - nel_includes="$with_nel/include" - nel_libraries="$with_nel/lib" - fi -fi - -if test "$with_nel_include" -then - nel_includes="$with_nel_include" -fi - -if test "$with_nel_lib" -then - nel_libraries="$with_nel_lib" -fi - -# -# Set compilation variables -# -if test "$nel_includes" -then - CXXFLAGS="$CXXFLAGS -I$nel_includes" -fi - -if test "$nel_libraries" -then - LDFLAGS="-L$nel_libraries $LDFLAGS" -fi - -# -# Collect headers information and bark if missing and -# mandatory -# - -MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory) -MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory) -MY_NEL_HEADER_CHK([NeL 3D], [nel/3d/u_camera.h], [NL_U_CAMERA_H], $nel3d_is_mandatory) -MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory) -MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory) -MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory) -MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory) - -# -# Collect libraries information and bark if missing and -# mandatory -# - -MY_NEL_LIB_CHK([NeL Misc], [nelmisc], $nelmisc_is_mandatory) -MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory) -MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory) -MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory) -MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory) -MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory) -MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory) - -]) - -# ========================================================================= -# AM_PATH_OPENGL : OpenGL checking macros - -AC_DEFUN([AM_PATH_OPENGL], -[ AC_MSG_CHECKING(for OpenGL headers and GL Version >= 1.2) - -is_mandatory="$1" - -AC_REQUIRE_CPP() - -AC_ARG_WITH( opengl, - [ --with-opengl= path to the OpenGL install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( opengl-include, - [ --with-opengl-include= - path to the OpenGL header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( opengl-lib, - [ --with-opengl-lib= - path to the OpenGL library files directory. - e.g. /usr/local/lib]) - -opengl_lib="GL" - -if test "$with_opengl" -then - opengl_includes="$with_opengl/include" - opengl_libraries="$with_opengl/lib" -fi - -if test "$with_opengl_include" -then - opengl_includes="$with_opengl_include" -fi - -if test "$with_opengl_lib" -then - opengl_libraries="$with_opengl_lib" -fi - -# Set OPENGL_CFLAGS -if test "$opengl_includes" -then - OPENGL_CFLAGS="-I$opengl_includes" -fi - -# Set OPENGL_LIBS -if test "$opengl_libraries" -then - OPENGL_LIBS="-L$opengl_libraries" -fi -OPENGL_LIBS="$OPENGL_LIBS -l$opengl_lib" - -# Test the headers -_CPPFLAGS="$CPPFLAGS" - -CPPFLAGS="$CXXFLAGS $OPENGL_CFLAGS" - -AC_EGREP_CPP( yo_opengl, -[#include -#if defined(GL_VERSION_1_2) - yo_opengl -#endif], - have_opengl_headers="yes", - have_opengl_headers="no" ) - -if test "$have_opengl_headers" = "yes" -then - if test "$opengl_includes" - then - AC_MSG_RESULT([$opengl_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Checking the GLEXT version >= 7 -AC_MSG_CHECKING(for and GLEXT version >= 7) - -AC_EGREP_CPP( yo_glext_version, -[#include -#ifdef GL_GLEXT_VERSION -#if GL_GLEXT_VERSION >= 7 - yo_glext_version -#endif -#endif], - have_glext="yes", - have_glext="no" ) - -if test "$have_glext" = "yes" -then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT([no, can be downloaded from http://oss.sgi.com/projects/ogl-sample/ABI/]) -fi - -# Test the libraries -AC_MSG_CHECKING(for OpenGL libraries) - -CPPFLAGS="$CXXFLAGS $OPENGL_LIBS" - -AC_TRY_LINK( , , have_opengl_libraries="yes", have_opengl_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_opengl_libraries" = "yes" -then - if test "$opengl_libraries" - then - AC_MSG_RESULT([$opengl_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -opengl_libraries="$opengl_libraries" - -if test "$have_opengl_headers" = "yes" \ - -a "$have_glext" = "yes" \ - -a "$have_opengl_libraries" = "yes" -then - have_opengl="yes" -else - have_opengl="no" -fi - -if test "$have_opengl" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([OpenGL >= 1.2 must be installed (http://www.mesa3d.org)]) -fi - -AC_SUBST(OPENGL_CFLAGS) -AC_SUBST(OPENGL_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_FREETYPE : FreeType checking macros - -AC_DEFUN([AM_PATH_FREETYPE], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -AC_ARG_WITH( freetype, - [ --with-freetype= path to the FreeType install files directory. - e.g. /usr/local/freetype]) - -AC_ARG_WITH( freetype-include, - [ --with-freetype-include= - path to the FreeType header files directory. - e.g. /usr/local/freetype/include]) - -AC_ARG_WITH( freetype-lib, - [ --with-freetype-lib= - path to the FreeType library files directory. - e.g. /usr/local/freetype/lib]) - -freetype_lib="freetype" - - -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) - -if test "$FREETYPE_CONFIG" = "no" -then - have_freetype_config="no" -else - FREETYPE_CFLAGS=`freetype-config --cflags` - FREETYPE_LIBS=`freetype-config --libs` - have_freetype_config="yes" -fi - -if test "$with_freetype" -then - freetype_includes="$with_freetype/include" - freetype_libraries="$with_freetype/lib" -fi - -if test "$with_freetype_include" -then - freetype_includes="$with_freetype_include" -fi - -if test "$with_freetype_lib" -then - freetype_libraries="$with_freetype_lib" -fi - -if test "$freetype_includes" -then - FREETYPE_CFLAGS="-I$freetype_includes" -fi - -# Checking the FreeType 2 instalation -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS" - -AC_MSG_CHECKING(for FreeType version = 2) - -AC_EGREP_CPP( yo_freetype2, -[#include -#if FREETYPE_MAJOR == 2 - yo_freetype2 -#endif], - have_freetype2="yes", - have_freetype2="no") - -if test "$have_freetype2" = "yes" -then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for FreeType libraries) - -if test $freetype_libraries -then - FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib" -fi - -CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS" - -AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_freetype_libraries" = "yes" -then - if test "$freetype_libraries" - then - AC_MSG_RESULT([$freetype_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -if test "$have_freetype2" = "yes" && test "$have_freetype_libraries" = "yes" -then - have_freetype="yes" -else - have_freetype="no" -fi - -if test "$have_freetype" = "no" && test "$is_mandatory" = "yes" -then - AC_MSG_ERROR([FreeType 2 must be installed (http://freetype.sourceforge.net)]) -fi - -AC_SUBST(FREETYPE_CFLAGS) -AC_SUBST(FREETYPE_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_XF86VIDMODE : XF86VidMode checking macros - -AC_DEFUN([AM_PATH_XF86VIDMODE], -[ AC_MSG_CHECKING(for XF86VidMode extension) - -AC_REQUIRE_CPP() - -AC_ARG_WITH( xf86vidmode-lib, - [ --with-xf86vidmode-lib= - path to the XF86VidMode library. - e.g. /usr/X11R6/lib] ) - -xf86vidmode_lib="Xxf86vm" - -if test "$with_xf86vidmode_lib" = no -then - # The user explicitly disabled the use of XF86VidMode - have_xf86vidmode="disabled" - AC_MSG_RESULT(disabled) -else - if test "$with_xf86vidmode_lib" - then - xf86vidmode_libraries="$with_xf86vidmode_lib" - fi - - XF86VIDMODE_CFLAGS="-DXF86VIDMODE" -fi - -if test -z "$have_xf86vidmode" -# -a "$with_xf86vidmode_lib" -then - if test "$xf86vidmode_libraries" - then - XF86VIDMODE_LIBS="-L$xf86vidmode_libraries" - fi - - XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS -l$xf86vidmode_lib" - - _CPPFLAGS="$CPPFLAGS" - - CPPFLAGS="$CXXFLAGS $XF86VIDMODE_LIBS" - - AC_TRY_LINK( , , have_xf86vidmode_libraries="yes", have_xf86vidmode_libraries="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_xf86vidmode_libraries" = "yes" - then - have_xf86vidmode="yes" - if test "$xf86vidmode_libraries" - then - AC_MSG_RESULT($xf86vidmode_libraries) - else - AC_MSG_RESULT(yes) - fi - else - have_xf86vidmode="no" - AC_MSG_RESULT(no, no fullscreen support available.) - fi - - xf86vidmode_libraries="$xf86vidmode_libraries" - -fi - -AC_SUBST(XF86VIDMODE_CFLAGS) -AC_SUBST(XF86VIDMODE_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_OPENAL : OpenAL checking macros - -AC_DEFUN([AM_PATH_OPENAL], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the OpenAL files location -AC_ARG_WITH( openal, - [ --with-openal= path to the OpenAL install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( openal-include, - [ --with-openal-include= - path to the OpenAL header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( openal-lib, - [ --with-openal-lib= - path to the OpenAL library files directory. - e.g. /usr/local/lib]) - -openal_lib="openal" -alut_lib="alut" - -if test $with_openal -then - openal_includes="$with_openal/include" - openal_libraries="$with_openal/lib" -fi - -if test "$with_openal_include" -then - openal_includes="$with_openal_include" -fi - -if test "$with_openal_lib" -then - openal_libraries="$with_openal_lib" -fi - - -# Set OPENAL_CFLAGS -if test "$openal_includes" -then - OPENAL_CFLAGS="-I$openal_includes" -fi - -# Set OPENAL_LIBS -if test "$openal_libraries" -then - OPENAL_LIBS="-L$openal_libraries" -fi -OPENAL_LIBS="$OPENAL_LIBS -l$openal_lib -l$alut_lib" - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS" - -AC_MSG_CHECKING(for OpenAL headers) -AC_EGREP_CPP( yo_openal, -[#include -#include -#ifdef AL_VERSION - yo_openal -#endif], - have_openal_headers="yes", - have_openal_headers="no" ) - -if test "$have_openal_headers" = "yes" -then - if test "$openal_includes" - then - AC_MSG_RESULT([$openal_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for OpenAL libraries) - -CPPFLAGS="$CXXFLAGS $OPENAL_LIBS" - -AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_openal_libraries" = "yes" -then - if test "$openal_libraries" - then - AC_MSG_RESULT([$openal_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -openal_libraries="$openal_libraries" - -if test "$have_openal_headers" = "yes" \ - && test "$have_openal_libraries" = "yes" -then - have_openal="yes" -else - have_openal="no" -fi - -if test "$have_openal" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([OpenAL is needed to compile NeL (http://www.openal.org).]) -fi - -AC_SUBST(OPENAL_CFLAGS) -AC_SUBST(OPENAL_LIBS) -AC_SUBST([have_openal]) - -]) - - -# ========================================================================= -# AM_PATH_PYTHON : Python checking macros - -AC_DEFUN([AM_PATH_PYTHON], -[ python_version_required="$1" - -is_mandatory="$2" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the Python files location -AC_ARG_WITH( python, - [ --with-python= path to the Python prefix installation directory. - e.g. /usr/local], - [ PYTHON_PREFIX=$with_python ] -) - -AC_ARG_WITH( python-version, - [ --with-python-version= - Python version to use, e.g. 1.5], - [ PYTHON_VERSION=$with_python_version ] -) - -if test ! "$PYTHON_PREFIX" = "" -then - PATH="$PYTHON_PREFIX/bin:$PATH" -fi - -if test ! "$PYTHON_VERSION" = "" -then - PYTHON_EXEC="python$PYTHON_VERSION" -else - PYTHON_EXEC="python python2.1 python2.0 python1.5" -fi - -AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH) - -if test "$PYTHON" != "no" -then - PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'` - PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'` - - is_python_version_enough=`expr $python_version_required \<= $PYTHON_VERSION` -fi - - -if test "$PYTHON" = "no" || test "$is_python_version_enough" != "1" -then - - if test "$is_mandatory" = "yes" - then - AC_MSG_ERROR([Python $python_version_required must be installed (http://www.python.org)]) - else - have_python="no" - fi - -else - - python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION" - python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config" - python_lib="python$PYTHON_VERSION" - - PYTHON_CFLAGS="-I$python_includes" - PYTHON_LIBS="-L$python_libraries -l$python_lib" - - _CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CXXFLAGS ${PYTHON_CFLAGS}" - - # Test the headers - AC_MSG_CHECKING(for Python headers) - - AC_EGREP_CPP( yo_python, - [#include - yo_python - ], - have_python_headers="yes", - have_python_headers="no" ) - - if test "$have_python_headers" = "yes" - then - AC_MSG_RESULT([$python_includes]) - else - AC_MSG_RESULT(no) - fi - - # Test the libraries - AC_MSG_CHECKING(for Python libraries) - - CPPFLAGS="$CXXFLAGS $PYTHON_CFLAGS" - - AC_TRY_LINK( , , have_python_libraries="yes", have_python_libraries="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_python_libraries" = "yes" - then - if test "$python_libraries" - then - AC_MSG_RESULT([$python_libraries]) - else - AC_MSG_RESULT(yes) - fi - else - AC_MSG_RESULT(no) - fi - - if test "$have_python_headers" = "yes" \ - && test "$have_python_libraries" = "yes" - then - have_python="yes" - else - have_python="no" - fi - - if test "$have_python" = "no" -a "$is_mandatory" = "yes" - then - AC_MSG_ERROR([Python is needed to compile NeL (http://www.python.org).]) - fi - - AC_SUBST(PYTHON_CFLAGS) - AC_SUBST(PYTHON_LIBS) - -fi - -]) - -# ========================================================================= -# AM_PATH_MYSQL : MySQL library - -# AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -# Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS -# -AC_DEFUN([AM_PATH_MYSQL], -[# -# Get the cflags and libraries from the mysql_config script -# -AC_ARG_WITH(mysql-prefix,[ --with-mysql-prefix=PFX Prefix where MYSQL is installed (optional)], - mysql_prefix="$withval", mysql_prefix="") -AC_ARG_WITH(mysql-exec-prefix,[ --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)], - mysql_exec_prefix="$withval", mysql_exec_prefix="") -AC_ARG_ENABLE(mysqltest, [ --disable-mysqltest Do not try to compile and run a test MYSQL program], - , enable_mysqltest=yes) - - if test x$mysql_exec_prefix != x ; then - mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix" - if test x${MYSQL_CONFIG+set} != xset ; then - MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config - fi - fi - if test x$mysql_prefix != x ; then - mysql_args="$mysql_args --prefix=$mysql_prefix" - if test x${MYSQL_CONFIG+set} != xset ; then - MYSQL_CONFIG=$mysql_prefix/bin/mysql_config - fi - fi - - AC_REQUIRE([AC_CANONICAL_TARGET]) - AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no) - min_mysql_version=ifelse([$1], ,0.11.0,$1) - AC_MSG_CHECKING(for MYSQL - version >= $min_mysql_version) - no_mysql="" - if test "$MYSQL_CONFIG" = "no" ; then - no_mysql=yes - else - MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"` - MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"` - - mysql_major_version=`$MYSQL_CONFIG $mysql_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - mysql_minor_version=`$MYSQL_CONFIG $mysql_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - mysql_micro_version=`$MYSQL_CONFIG $mysql_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_mysqltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $MYSQL_CFLAGS" - LIBS="$LIBS $MYSQL_LIBS" -# -# Now check if the installed MYSQL is sufficiently new. (Also sanity -# checks the results of mysql_config to some extent -# - rm -f conf.mysqltest - AC_TRY_RUN([ -#include -#include -#include -#include - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.mysqltest"); - */ - { FILE *fp = fopen("conf.mysqltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_mysql_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_mysql_version"); - exit(1); - } - - if (($mysql_major_version > major) || - (($mysql_major_version == major) && ($mysql_minor_version > minor)) || - (($mysql_major_version == major) && ($mysql_minor_version == minor) && ($mysql_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'mysql_config --version' returned %d.%d.%d, but the minimum version\n", $mysql_major_version, $mysql_minor_version, $mysql_micro_version); - printf("*** of MYSQL required is %d.%d.%d. If mysql_config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If mysql_config was wrong, set the environment variable MYSQL_CONFIG\n"); - printf("*** to point to the correct copy of mysql_config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_mysql=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_mysql" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$MYSQL_CONFIG" = "no" ; then - echo "*** The mysql_config script installed by MYSQL could not be found" - echo "*** If MYSQL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the MYSQL_CONFIG environment variable to the" - echo "*** full path to mysql_config." - else - if test -f conf.mysqltest ; then - : - else - echo "*** Could not run MYSQL test program, checking why..." - CFLAGS="$CFLAGS $MYSQL_CFLAGS" - LIBS="$LIBS $MYSQL_LIBS" - AC_TRY_LINK([ -#include -#include - -int main(int argc, char *argv[]) -{ return 0; } -#undef main -#define main K_and_R_C_main -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding MYSQL or finding the wrong" - echo "*** version of MYSQL. If it is not finding MYSQL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means MYSQL was incorrectly installed" - echo "*** or that you have moved MYSQL since it was installed. In the latter case, you" - echo "*** may want to edit the mysql_config script: $MYSQL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - MYSQL_CFLAGS="" - MYSQL_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(MYSQL_CFLAGS) - AC_SUBST(MYSQL_LIBS) - rm -f conf.mysqltest -]) - -# ========================================================================= -# AM_PATH_FMOD : FMOD checking macros - -AC_DEFUN([AM_PATH_FMOD], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the FMOD files location -AC_ARG_WITH( fmod, - [ --with-fmod= path to the FMOD install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( fmod-include, - [ --with-fmod-include= - path to the FMOD header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( fmod-lib, - [ --with-fmod-lib= - path to the FMOD library files directory. - e.g. /usr/local/lib]) - -fmod_lib="fmod" - -if test $with_fmod -then - fmod_includes="$with_fmod/include" - fmod_libraries="$with_fmod/lib" -fi - -if test "$with_fmod_include" -then - fmod_includes="$with_fmod_include" -fi - -if test "$with_fmod_lib" -then - fmod_libraries="$with_fmod_lib" -fi - - -# Set FMOD_CFLAGS -if test "$fmod_includes" -then - FMOD_CFLAGS="-I$fmod_includes" -fi - -# Set FMOD_LIBS -if test "$fmod_libraries" -then - FMOD_LIBS="-L$fmod_libraries" -fi -FMOD_LIBS="$FMOD_LIBS -l$fmod_lib" - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS $FMOD_CFLAGS" - -AC_MSG_CHECKING(for FMOD headers) -AC_EGREP_CPP( yo_fmod, -[#include -#ifdef FMOD_VERSION - yo_fmod -#endif], - have_fmod_headers="yes", - have_fmod_headers="no" ) - -if test "$have_fmod_headers" = "yes" -then - if test "$fmod_includes" - then - AC_MSG_RESULT([$fmod_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for FMOD libraries) - -CPPFLAGS="$CXXFLAGS $FMOD_LIBS" - -AC_TRY_LINK( , , have_fmod_libraries="yes", have_fmod_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_fmod_libraries" = "yes" -then - if test "$fmod_libraries" - then - AC_MSG_RESULT([$fmod_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -fmod_libraries="$fmod_libraries" - -if test "$have_fmod_headers" = "yes" \ - && test "$have_fmod_libraries" = "yes" -then - have_fmod="yes" -else - have_fmod="no" -fi - -if test "$have_fmod" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([FMOD is needed to compile NeL (http://www.fmod.org).]) -fi - -AC_SUBST(FMOD_CFLAGS) -AC_SUBST(FMOD_LIBS) -AC_SUBST([have_fmod]) - -]) - -# ========================================================================= -# End of file - diff --git a/code/nelns/admin_executor_service/Makefile.am b/code/nelns/admin_executor_service/Makefile.am deleted file mode 100644 index aafee52b1..000000000 --- a/code/nelns/admin_executor_service/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id: Makefile.am,v 1.8 2004/03/02 09:10:50 cado Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = admin_executor_service.cfg \ - admin_executor_service.dsp \ - admin_executor_service_8.vcproj \ - admin_executor_service.vcproj \ - log_report.h \ - common.cfg - -sbin_PROGRAMS = admin_executor_service - -admin_executor_servicedir = ${pkgsysconfdir} -admin_executor_service_DATA = admin_executor_service.cfg common.cfg - -AM_CXXFLAGS = -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\"" - -admin_executor_service_SOURCES = admin_executor_service.cpp \ - log_report.cpp - -# End of Makefile.am - diff --git a/code/nelns/admin_service/Makefile.am b/code/nelns/admin_service/Makefile.am deleted file mode 100644 index 0513d968c..000000000 --- a/code/nelns/admin_service/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# -# $Id: Makefile.am,v 1.7 2002/11/13 16:59:55 coutelas Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = common.cfg \ - admin_service.cfg \ - admin_service.dsp \ - admin_service_8.vcproj \ - admin_service.vcproj - -sbin_PROGRAMS = admin_service - -admin_servicedir = ${pkgsysconfdir} -admin_service_DATA = admin_service.cfg common.cfg -admin_service_LDADD = @MYSQL_LDFLAGS@ - -AM_CXXFLAGS = -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\"" @MYSQL_CFLAGS@ - -admin_service_SOURCES = admin_service.cpp connection_web.cpp - -# End of Makefile.am - diff --git a/code/nelns/autogen.sh b/code/nelns/autogen.sh deleted file mode 100755 index 426af8b39..000000000 --- a/code/nelns/autogen.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - - -WANT_AUTOMAKE="1.6" - -echo "Creating macros..." && \ -aclocal -I automacros/ && \ -echo "Creating library tools..." && \ -libtoolize --force && \ -echo "Creating header templates..." && \ -autoheader && \ -echo "Creating Makefile templates..." && \ -automake --gnu --add-missing && \ -echo "Creating 'configure'..." && \ -autoconf && \ -echo -e "\nRun: ./configure; make; make install\n" diff --git a/code/nelns/automacros/mysql.m4 b/code/nelns/automacros/mysql.m4 deleted file mode 100644 index 4d5adf3cd..000000000 --- a/code/nelns/automacros/mysql.m4 +++ /dev/null @@ -1,101 +0,0 @@ -AC_DEFUN([AX_LIB_MYSQL], -[ - AC_ARG_WITH([mysql], - AC_HELP_STRING([--with-mysql=@<:@ARG@:>@], - [use MySQL client library @<:@default=yes@:>@, optionally specify path to mysql_config] - ), - [ - if test "$withval" = "no"; then - want_mysql="no" - elif test "$withval" = "yes"; then - want_mysql="yes" - else - want_mysql="yes" - MYSQL_CONFIG="$withval" - fi - ], - [want_mysql="yes"] - ) - - MYSQL_CFLAGS="" - MYSQL_LDFLAGS="" - MYSQL_VERSION="" - - dnl - dnl Check MySQL libraries (libpq) - dnl - - if test "$want_mysql" = "yes"; then - - if test -z "$MYSQL_CONFIG" -o test; then - AC_PATH_PROG([MYSQL_CONFIG], [mysql_config], [no]) - fi - - if test "$MYSQL_CONFIG" != "no"; then - AC_MSG_CHECKING([for MySQL libraries]) - - MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" - MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" - - MYSQL_VERSION=`$MYSQL_CONFIG --version` - - AC_DEFINE([HAVE_MYSQL], [1], - [Define to 1 if MySQL libraries are available]) - - found_mysql="yes" - AC_MSG_RESULT([yes]) - else - found_mysql="no" - AC_MSG_RESULT([no]) - fi - fi - - dnl - dnl Check if required version of MySQL is available - dnl - - - mysql_version_req=ifelse([$1], [], [], [$1]) - - if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then - - AC_MSG_CHECKING([if MySQL version is >= $mysql_version_req]) - - dnl Decompose required version string of MySQL - dnl and calculate its number representation - mysql_version_req_major=`expr $mysql_version_req : '\([[0-9]]*\)'` - mysql_version_req_minor=`expr $mysql_version_req : '[[0-9]]*\.\([[0-9]]*\)'` - mysql_version_req_micro=`expr $mysql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` - if test "x$mysql_version_req_micro" = "x"; then - mysql_version_req_micro="0" - fi - - mysql_version_req_number=`expr $mysql_version_req_major \* 1000000 \ - \+ $mysql_version_req_minor \* 1000 \ - \+ $mysql_version_req_micro` - - dnl Decompose version string of installed MySQL - dnl and calculate its number representation - mysql_version_major=`expr $MYSQL_VERSION : '\([[0-9]]*\)'` - mysql_version_minor=`expr $MYSQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` - mysql_version_micro=`expr $MYSQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` - if test "x$mysql_version_micro" = "x"; then - mysql_version_micro="0" - fi - - mysql_version_number=`expr $mysql_version_major \* 1000000 \ - \+ $mysql_version_minor \* 1000 \ - \+ $mysql_version_micro` - - mysql_version_check=`expr $mysql_version_number \>\= $mysql_version_req_number` - if test "$mysql_version_check" = "1"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - fi - - AC_SUBST([MYSQL_VERSION]) - AC_SUBST([MYSQL_CFLAGS]) - AC_SUBST([MYSQL_LDFLAGS]) -]) diff --git a/code/nelns/configure.ac b/code/nelns/configure.ac deleted file mode 100644 index ef7f65029..000000000 --- a/code/nelns/configure.ac +++ /dev/null @@ -1,186 +0,0 @@ -# ==================================================================== -# Configuration script for NeLNS -# ==================================================================== -# -# $Id: configure.ac,v 1.4 2005/01/07 18:29:56 distrib Exp $ -# - -# ==================================================================== -# Process this file with autoconf to produce a configure script. -# ==================================================================== - -# If you want to change the version, must must change AC_INIT -# *and* AC_SUBST(LIBTOOL_VERSION) - -AC_PREREQ(2.57) -AC_INIT([nelns],[0.5.0],[nel-all@nevrax.org]) - -AC_CANONICAL_TARGET - -AM_INIT_AUTOMAKE([tar-ustar]) - -AM_CONFIG_HEADER(config.h) - -AC_SUBST(LIBTOOL_VERSION, [0:5:0]) - -# ==================================================================== -# Checks for programs. -# ==================================================================== - - -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_LIBTOOL -AM_PROG_LIBTOOL -AM_SANITY_CHECK - -AC_SYS_LARGEFILE - -AM_MAINTAINER_MODE - -# The following hack should ensure that configure doesn't add optimizing -# or debugging flags to CFLAGS or CXXFLAGS -CFLAGS="$CFLAGS " -CXXFLAGS="$CXXFLAGS " - -# Template needed to generate the config.h.in -#AH_TEMPLATE([NELNS_CONFIG],[Configuration files directory path]) -#AH_TEMPLATE([NELNS_LOGS],[Log files directory path]) -#AH_TEMPLATE([NELNS_STATE],[Local state files directory path]) -AH_TEMPLATE([HAVE_MYSQL],[Define to 1 if mysql was found]) - - -AX_LIB_MYSQL([3.23.40]) -#dnl AM_PATH_MYSQL(3.23.40,,AC_MSG_ERROR([MySQL 3.23.40 or higher must be installed])) - -AC_DEFINE(HAVE_MYSQL) - -CFLAGS="$CFLAGS $MYSQL_CFLAGS" -CXXFLAGS="$CXXFLAGS $MYSQL_CFLAGS" - -# prevent using GLIBC2.4 stuffs -CFLAGS="$CFLAGS -fno-stack-protector" -CXXFLAGS="$CXXFLAGS -fno-stack-protector" - -LIBS="$LIBS -lrt $MYSQL_LIBS" - - -# ==================================================================== -# Configure Settings -# ==================================================================== - -AC_LANG([C++]) - - -# ==================================================================== -# Debug/optimized compilation mode -# ==================================================================== - -AM_NEL_DEBUG - -# Set the gcc specific warning level -if test "X$CC" = "Xgcc"; -then - if test "$with_debug" != "no" - then - # - # When debugging variables are declared for the sole purpose of - # inspecting their content with a debugger. They are not used - # in the code itself and this is legitimate, hence the -Wno-unused - # - CXXFLAGS="$CXXFLAGS -Wall -Wno-multichar -Wno-unused" - else - CXXFLAGS="$CXXFLAGS -Wall -Wno-multichar" - fi -fi - -# ==================================================================== -# Checks for typedefs, structures, and compiler characteristics. -# ==================================================================== - -# Add the define _REENTRANT for a correct use of the threads -if test "X$CC" = "Xgcc"; -then - CXXFLAGS="$CXXFLAGS -D_REENTRANT" -fi - - -# ==================================================================== -# Checks for header files. -# ==================================================================== - -AC_HEADER_STDC([]) -AC_CHECK_HEADERS(fcntl.h unistd.h) - - -# ==================================================================== -# Checks for libraries. -# ==================================================================== - -AC_CHECK_LIB(crypt, crypt) - - -# ==================================================================== -# NeL - -# misc net 3d pacs sound ai georges -AM_PATH_NEL("yes", "yes", "no", "no", "no", "no", "no") - -# ==================================================================== -# Checks for library functions. -# ==================================================================== - -# ==================================================================== -# nelns configuration and logs file location -# ==================================================================== - -test "x$prefix" = xNONE && prefix=$ac_default_prefix - -AC_ARG_WITH(sysconfdir, - [ --with-sysconfdir[=DIR] - use DIR instead of the default sysconfdir/nelns], - [pkgsysconfdir=$withval], - [pkgsysconfdir='${sysconfdir}/nelns']) -AC_SUBST(pkgsysconfdir) - -#eval eval NELNS_CONFIG=\"$pkgsysconfdir/\" -#AC_DEFINE_UNQUOTED(NELNS_CONFIG, "$NELNS_CONFIG") - -AC_ARG_WITH(localstatedir, - [ --with-localstatedir[=DIR] - use DIR instead of the default localstatedir/game/nelns], - [pkglocalstatedir=$withval], - [pkglocalstatedir=${localstatedir}/game/nelns]) -AC_SUBST(pkglocalstatedir) - -#eval eval NELNS_STATE=\"$pkglocalstatedir/\" -#AC_DEFINE_UNQUOTED(NELNS_STATE, "$NELNS_STATE") - -AC_ARG_WITH(logdir, - [ --with-logdir[=DIR] - use DIR instead of the default localstatedir/log/nelns], - [logdir=$withval], - [logdir='${localstatedir}/log/nelns']) -AC_SUBST(logdir) - -#eval eval NELNS_LOGS=\"$logdir/\" -#AC_DEFINE_UNQUOTED(NELNS_LOGS, "$NELNS_LOGS") - -# ==================================================================== -# Output files to generate. -# ==================================================================== - -AC_CONFIG_FILES([Makefile \ - login_service/Makefile \ - naming_service/Makefile \ - admin_executor_service/Makefile \ - admin_service/Makefile \ - welcome_service/Makefile \ -]) -AC_OUTPUT - - -# End of configure.ac diff --git a/code/nelns/login_service/Makefile.am b/code/nelns/login_service/Makefile.am deleted file mode 100644 index 15a9eae6c..000000000 --- a/code/nelns/login_service/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# -# $Id: Makefile.am,v 1.8 2002-09-16 14:50:07 lecroart Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = login_service.cfg \ - login_service.dsp \ - login_service.vcproj \ - login_service_8.vcproj \ - common.cfg - -sbin_PROGRAMS = login_service - -login_servicedir = ${pkgsysconfdir} -login_service_DATA = login_service.cfg common.cfg -login_service_LDADD = @MYSQL_LDFLAGS@ - -AM_CXXFLAGS = -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\"" @MYSQL_CFLAGS@ - -login_service_SOURCES = mysql_helper.cpp \ - mysql_helper.h \ - connection_client.cpp \ - connection_client.h \ - connection_web.cpp \ - connection_web.h \ - connection_ws.cpp \ - connection_ws.h \ - login_service.cpp \ - login_service.h - -# End of Makefile.am - diff --git a/code/nelns/naming_service/Makefile.am b/code/nelns/naming_service/Makefile.am deleted file mode 100644 index 95e510f7f..000000000 --- a/code/nelns/naming_service/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# -# $Id: Makefile.am,v 1.5 2002/06/12 10:22:28 lecroart Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = naming_service.cfg \ - naming_service.dsp \ - naming_service.vcproj \ - naming_service_8.vcproj \ - common.cfg - -sbin_PROGRAMS = naming_service - -naming_servicedir = ${pkgsysconfdir} -naming_service_DATA = naming_service.cfg common.cfg - -AM_CXXFLAGS = -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\"" - -naming_service_SOURCES = naming_service.cpp - -# End of Makefile.am diff --git a/code/nelns/welcome_service/Makefile.am b/code/nelns/welcome_service/Makefile.am deleted file mode 100644 index 35b7d6eb5..000000000 --- a/code/nelns/welcome_service/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# -# $Id: Makefile.am,v 1.7 2006/05/31 12:14:16 boucher Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = welcome_service.cfg \ - welcome_service.dsp \ - welcome_service.vcproj \ - welcome_service_8.vcproj \ - common.cfg - -sbin_PROGRAMS = welcome_service - -welcome_servicedir = ${pkgsysconfdir} -welcome_service_DATA = welcome_service.cfg common.cfg - -AM_CXXFLAGS = -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\"" - -welcome_service_SOURCES = welcome_service.cpp \ - welcome_service_itf.cpp - -# End of Makefile.am diff --git a/code/ryzom/Makefile b/code/ryzom/Makefile deleted file mode 100644 index 2a1850c35..000000000 --- a/code/ryzom/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -MAKE_NIGHT_ARGS=-j2 -MAKE_ALL_ARGS=-j2 -CXX=g++ -CC=g++ -BIN_DIR=$(RYZOM_PATH)/tools/scripts/linux - -night: - +make $(MAKE_NIGHT_ARGS) -k -C common night CXX=$(CXX) - +make $(MAKE_NIGHT_ARGS) -k -C server night CXX=$(CXX) - -all: - +make $(MAKE_ALL_ARGS) -C common all - +make $(MAKE_ALL_ARGS) -C server all - -mono: - +make -C common all - +make -C server all - -clean: - +make -C common clean - +make -C server clean - -distclean: - +make -C common distclean - +make -C server distclean - -cleansheets: - +make -C common cleansheets - +make -C server cleansheets - -update: - +make -C common update - +make -C server update - -touch: - +make -C common touch - +make -C server touch diff --git a/code/ryzom/Rules.mk b/code/ryzom/Rules.mk deleted file mode 100644 index 67bc3bc42..000000000 --- a/code/ryzom/Rules.mk +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################# -# A few basic default rules and intrinsic rules - -# Load objects dependencies -ifeq (Dependencies.mk,$(wildcard Dependencies.mk)) -include Dependencies.mk -check-deps: - @echo - @echo Dependencies found [OK] - @echo -else -check-deps: - @echo - @echo "No dependencies found [ERROR]" - @echo "You should try 'make update' first" - @echo - @exit 1 -endif - -# Start off by over-riding the default build rules with our own intrinsics -.SUFFIXES: -.SUFFIXES: .cpp .o -.cpp.o: - $(CXX) -c $(CXXFLAGS) $< -o $@ - -# remove object files and core (if any) -clean: - find . -name "core*" -exec $(RM) {} \; - find . -name "*.o" -exec $(RM) {} \; - find . -name "*~" -exec $(RM) {} \; - find . -name "Dependencies.mk" -exec $(RM) {} \; - find . -name "Objects.mk" -exec $(RM) {} \; - -cleansheets: - find . -name "*.packed_sheets" -exec $(RM) {} \; - -# remove object files, core dump, and executable (if any) -distclean: - $(MAKE) clean - $(RM) $(TARGETS) - $(RM) $(TARGETS)_debug - -# make the thing again from scratch -again: - $(MAKE) distclean - $(MAKE) $(TARGETS) - -#UPDATE_OBJS=`cat $(DSP_TARGET) | grep SOURCE | sed -e 's/\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f3- | tr '\n' ' ' | sed -e 's/=/..\\\\/g' | tr '\n' ' ' | sed -e 's/\\\\/\\//g' | sed -e 's/\.cpp /\.o /g'` - -#UPDATE_SRCS=`cat $(DSP_TARGET) | grep SOURCE | sed -e 's/\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f3- | tr '\n' ' ' | sed -e 's/=/..\\\\/g' | tr '\n' ' ' | sed -e 's/\\\\/\\//g'` - -UPDATE_OBJS=`cat $(DSP_TARGET) | grep RelativePath | sed -e 's/\\"\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f2- | tr '\n' ' ' | sed -e 's/\\\\/\\//g' | sed -e 's/\.cpp /\.o /g'` -UPDATE_SRCS=`cat $(DSP_TARGET) | grep RelativePath | sed -e 's/\\"\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f2- | tr '\n' ' ' | sed -e 's/\\\\/\\//g'` - -dep: update - -update: -# ../gen_compile_flags.sh > RyzomCompilerFlags.mk - $(RYZOM_PATH)/gen_deps.sh $(CXX) $(CXXFLAGS) -- $(UPDATE_SRCS) > Dependencies.mk - echo "OBJS=$(UPDATE_OBJS)" > Objects.mk - -touch: - $(RM) $(TARGETS) - $(RM) $(TARGETS)_debug diff --git a/code/ryzom/Variables.mk b/code/ryzom/Variables.mk deleted file mode 100644 index a952922f0..000000000 --- a/code/ryzom/Variables.mk +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################# -# Setting up the global compiler settings... - -# The names of the executables -CXX = c++ -RM = rm -f -MAKE = make - -DBG = off - -ifeq (RyzomCompilerFlags.mk,$(wildcard RyzomCompilerFlags.mk)) -include RyzomCompilerFlags.mk -endif - -FLAGS_CMN = -g -pipe -fno-stack-protector -fno-strict-aliasing -Wall -D_REENTRANT -D_GNU_SOURCE -DFINAL_VERSION=1 -LD_FLAGS_CMN = -rdynamic - -FLAGS_DBG_on = -O0 -finline-functions -DNL_DEBUG -FLAGS_DBG_off = -O3 -funroll-loops -DNL_RELEASE -DIR_DBG_on = debug -DIR_DBG_off = release - -PACK_SHEETS_FLAGS = -A$RYZOM_PATH/server -L$RYZOM_PATH/server -C$RYZOM_PATH//server/sheet_pack_cfg -Q --nons - - -NEL_PATH = $(RYZOM_PATH)/../../code/install/$(DIR_DBG_$(DBG)) - -NEL_INCLUDE = $(RYZOM_PATH)/../../code/nel/include -RYZOM_COMMON_SRC = $(RYZOM_PATH)/common/src - -ifeq (Objects.mk,$(wildcard Objects.mk)) -include Objects.mk -endif diff --git a/code/ryzom/client/Makefile b/code/ryzom/client/Makefile deleted file mode 100644 index 11e58485a..000000000 --- a/code/ryzom/client/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - -all: - +make $(MAKE_ALL_ARGS) -C src all - -mono: - +make -C src all - -clean: - +make -C src clean - -cleansheets: - +make -C src cleansheets - -update: - +make -C src update - -touch: - +make -C src touch diff --git a/code/ryzom/client/src/Makefile b/code/ryzom/client/src/Makefile deleted file mode 100644 index bac8ed4a1..000000000 --- a/code/ryzom/client/src/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################# -# Simple make file for compiling Ryzom client - -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../Variables.mk - -WWWFLAGS = $(shell libwww-config --cflags) -WWWLDFLAGS = $(shell libwww-config --libs) -LUAFLAGS = $(shell pkg-config lua5.1 --cflags) -LUALDFLAGS = $(shell pkg-config lua5.1 --libs) - -# The flags for the C++ compiler -CXXFLAGS = $(WWWFLAGS) $(LUAFLAGS) \ - $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(RYZOM_PATH)/../../code/luabind \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_PATH)/common/src \ - -I$(RYZOM_PATH)/client/src/seven_zip \ - -I.. \ - -I. - -LDFLAGS = $(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_PATH)/common/src/game_share \ - -L$(RYZOM_PATH)/client/src/client_sheets \ - -L$(RYZOM_PATH)/client/src/seven_zip \ - -lclient_sheets \ - -lseven_zip \ - -lgame_share \ - -Wl,--start-group -lnel_drv_opengl -lnel3d -Wl,--end-group \ - -Wl,--start-group -lnel_drv_openal -lnelsnd -Wl,--end-group \ - -lnelpacs \ - -lnelligo \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lfreetype \ - -lxml2 \ - -ljpeg \ - -lpng \ - -lrt \ - -ldl \ - -lluabind \ - -lopenal \ - -lcurl \ - -lGL \ - -lX11 - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = client -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: client_sheets seven_zip exe - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -client_sheets: - make $(MAKE_ALL_ARGS) -C client_sheets all - -seven_zip: - make $(MAKE_ALL_ARGS) -C seven_zip all - -############################################################################# -# Rules - -include ../../Rules.mk diff --git a/code/ryzom/client/src/client_sheets/Makefile b/code/ryzom/client/src/client_sheets/Makefile deleted file mode 100644 index 1976cb190..000000000 --- a/code/ryzom/client/src/client_sheets/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################# -# Simple make file for compiling CLIENT SHEETS - -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I$(NEL_PATH)/include \ - -I$(RYZOM_PATH)/common/src \ - -I.. \ - -I. - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = libclient_sheets.a -DSP_TARGET = client_sheets.vcproj - -# The default build rule -all: check-deps $(TARGETS) - - -#libclient_sheets.so: $(OBJS) -# $(CXX) -o $@ $(OBJS) -shared $(LDFLAGS) - -libclient_sheets.a: $(OBJS) - ar r libclient_sheets.a $(OBJS) - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/client/src/seven_zip/Makefile b/code/ryzom/client/src/seven_zip/Makefile deleted file mode 100644 index ed87286ae..000000000 --- a/code/ryzom/client/src/seven_zip/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################# -# Simple make file for compiling SEVEN ZIP - -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -D_SZ_ONE_DIRECTORY \ - -I$(NEL_PATH)/include \ - -I$(RYZOM_PATH)/common/src \ - -I.. \ - -I. - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = libseven_zip.a -DSP_TARGET = seven_zip.vcproj - -# The default build rule -all: check-deps $(TARGETS) - - -#libseven_zip.so: $(OBJS) -# $(CXX) -o $@ $(OBJS) -shared $(LDFLAGS) - -libseven_zip.a: $(OBJS) - ar r libseven_zip.a $(OBJS) - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/common/Makefile b/code/ryzom/common/Makefile deleted file mode 100644 index f76559463..000000000 --- a/code/ryzom/common/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -MAKE_NIGHT_ARGS=-j2 -MAKE_ALL_ARGS=-j2 -CXX=g++ -CC=g++ -BIN_DIR=$(RYZOM_PATH)/tools/scripts/linux - -night: - +make $(MAKE_NIGHT_ARGS) -k -C src night CXX=$(CXX) - -all: - +make $(MAKE_ALL_ARGS) -C src all - -mono: - +make -C src all - -clean: - +make -C src clean - -distclean: - +make -C src distclean - -cleansheets: - +make -C src cleansheets - -update: - +make -C src update - -touch: - +make -C src touch diff --git a/code/ryzom/common/src/Makefile b/code/ryzom/common/src/Makefile deleted file mode 100644 index ef0bb500b..000000000 --- a/code/ryzom/common/src/Makefile +++ /dev/null @@ -1,36 +0,0 @@ - -BUILD_DIRS = game_share - -night: all - -all: $(foreach dir,$(BUILD_DIRS),$(dir)-all) - -%-all: - +make -k -C $* all - -clean: $(foreach dir,$(BUILD_DIRS),$(dir)-clean) - -%-clean: - +make -C $* clean - -distclean: $(foreach dir,$(BUILD_DIRS),$(dir)-distclean) - -%-distclean: - +make -C $* distclean - -cleansheets: $(foreach dir,$(BUILD_DIRS),$(dir)-cleansheets) - -%-cleansheets: - +make -C $* cleansheets - -update: $(foreach dir,$(BUILD_DIRS),$(dir)-update) - -%-update: - +make -C $* update - -touch: $(foreach dir,$(BUILD_DIRS),$(dir)-touch) - -%-touch: - +make -C $* touch - -.NOTPARALLEL: night all clean cleansheets update touch diff --git a/code/ryzom/common/src/game_share/Makefile b/code/ryzom/common/src/game_share/Makefile deleted file mode 100644 index ac78fd835..000000000 --- a/code/ryzom/common/src/game_share/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################# -# Simple make file for compiling GAME SHARE - -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I/usr/include/mysql \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_PATH)/common/src \ - -I./ \ - -I./character_structure \ - -I./egs_sheets \ - -I./entity_structure \ - -I./game_item_manager - -# The flags for the linker -LDFLAGS = $(LD_FLAGS_CMN) -L$(RYZOM_PATH)/install/$(DIR_DBG_$(DBG))/lib \ - -llibmysqlclient \ - -lnelnet \ - -lnelgeorges \ - -lnelpacs \ - -L/usr/lib \ - -L/usr/X11R6/lib \ - -lnelmisc \ - -lxml2 \ - -lstlport \ - -lpthread \ - -lld - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = libgame_share.a -DSP_TARGET = game_share.vcproj - -# The default build rule -all: check-deps $(TARGETS) - - -#libgame_share.so: $(OBJS) -# $(CXX) -o $@ $(OBJS) -shared $(LDFLAGS) - -libgame_share.a: $(OBJS) - ar r libgame_share.a $(OBJS) - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/common/src/game_share/game_share.vcproj b/code/ryzom/common/src/game_share/game_share.vcproj deleted file mode 100644 index a8a8e2d4b..000000000 --- a/code/ryzom/common/src/game_share/game_share.vcproj +++ /dev/null @@ -1,1720 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/gen_deps.sh b/code/ryzom/gen_deps.sh deleted file mode 100755 index a6a286289..000000000 --- a/code/ryzom/gen_deps.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -command='' -sources='' -phase=0 -for arg in $* -do - if [ "$phase" == 0 ] && [ "$arg" == '--' ] - then - phase=1 - elif [ "$phase" == 0 ] - then - command="$command $arg" - elif [ "$phase" == 1 ] - then - sources="$sources $arg" - fi -done - -for src in $sources -do - obj=`echo $src | sed -e 's/.cpp$/.o/'` - $command -MT $obj -M $src -done diff --git a/code/ryzom/server/Makefile b/code/ryzom/server/Makefile deleted file mode 100644 index f76559463..000000000 --- a/code/ryzom/server/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -MAKE_NIGHT_ARGS=-j2 -MAKE_ALL_ARGS=-j2 -CXX=g++ -CC=g++ -BIN_DIR=$(RYZOM_PATH)/tools/scripts/linux - -night: - +make $(MAKE_NIGHT_ARGS) -k -C src night CXX=$(CXX) - -all: - +make $(MAKE_ALL_ARGS) -C src all - -mono: - +make -C src all - -clean: - +make -C src clean - -distclean: - +make -C src distclean - -cleansheets: - +make -C src cleansheets - -update: - +make -C src update - -touch: - +make -C src touch diff --git a/code/ryzom/server/src/Makefile b/code/ryzom/server/src/Makefile deleted file mode 100644 index 04f20e3a5..000000000 --- a/code/ryzom/server/src/Makefile +++ /dev/null @@ -1,73 +0,0 @@ - -BUILD_DIRS = \ -server_share \ -ai_share \ -admin_modules \ -ryzom_admin_service \ -ryzom_naming_service \ -mirror_service \ -ryzom_welcome_service \ -tick_service \ -frontend_service \ -gpm_service \ -pd_lib \ -input_output_service \ -gameplay_module_lib \ -entities_game_service \ -ai_service \ -backup_service \ -dynamic_scenario_service \ -shard_unifier_service \ -session_browser_server \ -pd_support_service \ -monitor_service \ -log_analyser_service \ -mail_forum_service \ -logger_service - -# removed service -#pd_reference_builder \ - -night: all - -all: $(foreach dir,$(BUILD_DIRS),$(dir)-all) - -%-all: - +make -k -C $* all - -clean: $(foreach dir,$(BUILD_DIRS),$(dir)-clean) - -%-clean: - +make -C $* clean - -distclean: $(foreach dir,$(BUILD_DIRS),$(dir)-distclean) - -%-distclean: - +make -C $* distclean - -cleansheets: $(foreach dir,$(BUILD_DIRS),$(dir)-cleansheets) - -%-cleansheets: - +make -C $* cleansheets - -update: $(foreach dir,$(BUILD_DIRS),$(dir)-update) - -%-update: - +make -C $* update - -touch: $(foreach dir,$(BUILD_DIRS),$(dir)-touch) - -%-touch: - +make -C $* touch - -packed_sheets: $(foreach dir,$(BUILD_DIRS),$(dir)-packed_sheets) - -%-packed_sheets: - -make -C $* packed_sheets - -exe: $(foreach dir,$(BUILD_DIRS),$(dir)-exe) - -%-exe: - -make -C $* exe - -.NOTPARALLEL: night all clean cleansheets update touch diff --git a/code/ryzom/server/src/admin_modules/Makefile b/code/ryzom/server/src/admin_modules/Makefile deleted file mode 100644 index a58626197..000000000 --- a/code/ryzom/server/src/admin_modules/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -# The flags for the linker -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -lnelnet \ - -lnelmisc \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = libadmin_modules.a -DSP_TARGET = admin_modules.vcproj - -# The default build rule -all: check-deps $(TARGETS) - -libadmin_modules.a: $(OBJS) - ar r libadmin_modules.a $(OBJS) - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/admin_modules/admin_modules.vcproj b/code/ryzom/server/src/admin_modules/admin_modules.vcproj deleted file mode 100644 index 9ff52e2df..000000000 --- a/code/ryzom/server/src/admin_modules/admin_modules.vcproj +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/ags_test/Makefile b/code/ryzom/server/src/ags_test/Makefile deleted file mode 100644 index 290c6e153..000000000 --- a/code/ryzom/server/src/ags_test/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -# The flags for the linker -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -lgame_share \ - -lnelnet \ - -lnelgeorges \ - -lnelligo \ - -lnelpacs \ - -lnelmisc \ - -lxml2 - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = ags_test -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: check-deps $(TARGETS) - -ags_test: $(OBJS) - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/ai_service/Makefile b/code/ryzom/server/src/ai_service/Makefile deleted file mode 100644 index 81edd826c..000000000 --- a/code/ryzom/server/src/ai_service/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. \ - -I../ai_share - -# The flags for the linker -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../server_share \ - -L../admin_modules \ - -L../ai_share \ - -ladmin_modules \ - -lai_share \ - -lserver_share \ - -lgame_share \ - -lnelnet \ - -lnelgeorges \ - -lnelligo \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = ai_service -DSP_TARGET = $(TARGETS).vcproj -PACKED_SHEETS = \ - ais.packed_sheets \ - ais_action.packed_sheets \ - ais_fight_config.packed_sheets \ - ais_race_stats.packed_sheets - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a \ - ../server_share/libserver_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: $(TARGETS) - /bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS) - - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/ai_service/ai_service.vcproj b/code/ryzom/server/src/ai_service/ai_service.vcproj deleted file mode 100644 index add97a81e..000000000 --- a/code/ryzom/server/src/ai_service/ai_service.vcproj +++ /dev/null @@ -1,1260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/ai_service/doc/doxycfg/Makefile b/code/ryzom/server/src/ai_service/doc/doxycfg/Makefile deleted file mode 100644 index f403a35b7..000000000 --- a/code/ryzom/server/src/ai_service/doc/doxycfg/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PROJECT=ryzom-ais -DOX_DIR=../source -CPP_DIR=../.. -OUTPUT_DIR=../doxydoc -CFG_FILE=ryzom-ais.cfg - -DOX_FILES=index.dox fight.dox aggro.dox dynamic_bots.dox path_finding.dox primitive_parsing.dox positions.dox -CPP_FILES=script_compiler_native_func.cpp \ - nf_helpers.cpp nf_static.cpp nf_state_instance.cpp nf_grp.cpp nf_grp_npc.cpp \ - ai.h ai.cpp \ - ai_instance.h ai_instance.cpp \ - ai_mgr.h ai_mgr.cpp \ - ai_mgr_npc.h ai_mgr_npc.cpp \ - ai_mgr_fauna.h ai_mgr_fauna.cpp \ - ai_grp.h ai_grp.cpp \ - ai_grp_npc.h ai_grp_npc.cpp \ - ai_grp_fauna.h ai_grp_fauna.cpp \ - event_reaction_container.h \ - ai_pos.h ai_pos_mirror.h ai_pos_mirror_inline.h \ - ai_vector_mirror.h \ - ../ai_share/ai_coord.h \ - ../ai_share/ai_vector.h \ - ../ai_share/world_map.h - -SOURCE_FILES=$(patsubst %,$(DOX_DIR)/%,$(DOX_FILES)) $(patsubst %,$(CPP_DIR)/%,$(CPP_FILES)) - -DOXYGEN_TAG=$(OUTPUT_DIR)/$(PROJECT)/$(PROJECT).tag - -all:$(DOXYGEN_TAG) - -$(DOXYGEN_TAG):$(SOURCE_FILES) $(CFG_FILE) - doxygen ryzom-ais.cfg 2>>doxygen.warnings - -$(CFG_FILE):Makefile $(CFG_FILE).tmpl $(SOURCE_FILES) - cat $(CFG_FILE).tmpl > $@ - echo "INPUT = $(SOURCE_FILES)" >> $@ diff --git a/code/ryzom/server/src/ai_share/Makefile b/code/ryzom/server/src/ai_share/Makefile deleted file mode 100644 index 87271914d..000000000 --- a/code/ryzom/server/src/ai_share/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -lgame_share \ - -lnelnet \ - -lnelmisc \ - -lxml2 - -# The flags for the linker -LDFLAGS2 = -L$(RYZOM_PATH)/install/$(DIR_DBG_$(DBG))/lib \ - -lnelnet \ - -lnelgeorges \ - -lnelpacs \ - -L/usr/lib \ - -L/usr/X11R6/lib \ - -lnelmisc \ - -lxml2 \ - -lstlport \ - -lpthread - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = libai_share.a -DSP_TARGET = ai_share.vcproj - -# The default build rule -all: check-deps $(TARGETS) - -#libgame_share.so: $(OBJS) -# $(CXX) -o $@ $(OBJS) -shared $(LDFLAGS) - -libai_share.a: $(OBJS) - ar r libai_share.a $(OBJS) - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/ai_share/ai_share.vcproj b/code/ryzom/server/src/ai_share/ai_share.vcproj deleted file mode 100644 index 9473179ca..000000000 --- a/code/ryzom/server/src/ai_share/ai_share.vcproj +++ /dev/null @@ -1,481 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/backup_service/Makefile b/code/ryzom/server/src/backup_service/Makefile deleted file mode 100644 index 7a0a62582..000000000 --- a/code/ryzom/server/src/backup_service/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../server_share \ - -L../admin_modules \ - -lserver_share \ - -lgame_share \ - -ladmin_modules \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = backup_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/backup_service/backup_service.vcproj b/code/ryzom/server/src/backup_service/backup_service.vcproj deleted file mode 100644 index 9b5d08d2c..000000000 --- a/code/ryzom/server/src/backup_service/backup_service.vcproj +++ /dev/null @@ -1,379 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/dynamic_scenario_service/Makefile b/code/ryzom/server/src/dynamic_scenario_service/Makefile deleted file mode 100644 index 7c3c44fb0..000000000 --- a/code/ryzom/server/src/dynamic_scenario_service/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. \ - -I../ai_share - -# The flags for the linker -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../admin_modules \ - -L../server_share \ - -L../ai_share \ - -lai_share \ - -lserver_share \ - -lgame_share \ - -ladmin_modules \ - -lnelnet \ - -lnelgeorges \ - -lnelligo \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl\ - -lz - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = dynamic_scenario_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a \ - ../server_share/libserver_share.a \ - ../ai_share/libai_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.vcproj b/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.vcproj deleted file mode 100644 index 31c4ab657..000000000 --- a/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.vcproj +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/entities_game_service/Makefile b/code/ryzom/server/src/entities_game_service/Makefile deleted file mode 100644 index dba693dd2..000000000 --- a/code/ryzom/server/src/entities_game_service/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. \ - -I. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L../admin_modules \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../ai_share \ - -L../server_share \ - -L../pd_lib \ - -L../gameplay_module_lib \ - -ladmin_modules \ - -lpd_lib \ - -lai_share \ - -lserver_share \ - -lgame_share \ - -lnelligo \ - -lnelgeorges \ - -lgameplay_module_lib \ - -lnelnet \ - -lnelmisc \ - -lpd_lib \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = entities_game_service -DSP_TARGET = $(TARGETS).vcproj -PACKED_SHEETS = \ - egs_action_xp_factor.packed_sheets \ - egs_aiactions.packed_sheets \ - egs_continents.packed_sheets \ - egs_creatures.packed_sheets \ - egs_death_impact.packed_sheets \ - egs_emot.packed_sheets \ - egs_encyclo_album.packed_sheets \ - egs_encyclo_thema.packed_sheets \ - egs_items.packed_sheets \ - egs_loot_set.packed_sheets \ - egs_loot_table.packed_sheets \ - egs_outpost_building.packed_sheets \ - egs_outpost_squads.packed_sheets \ - egs_outposts.packed_sheets \ - egs_race_stats.packed_sheets \ - egs_sbricks.packed_sheets \ - egs_skill_tree.packed_sheets \ - egs_sphrases.packed_sheets \ - egs_starting_role.packed_sheets \ - egs_success_chance_tables.packed_sheets \ - egs_text_emotes.packed_sheets \ - egs_weather_function_params.packed_sheets \ - egs_weather_setup.packed_sheets \ - egs_world.packed_sheets \ - egs_xptables.packed_sheets - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a \ - ../server_share/libserver_share.a \ - ../pd_lib/libpd_lib.a \ - ../gameplay_module_lib/libgameplay_module_lib.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: $(TARGETS) - /bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS) - - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/entities_game_service/entities_game_service.vcproj b/code/ryzom/server/src/entities_game_service/entities_game_service.vcproj deleted file mode 100644 index c75454117..000000000 --- a/code/ryzom/server/src/entities_game_service/entities_game_service.vcproj +++ /dev/null @@ -1,2976 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/frontend_service/Makefile b/code/ryzom/server/src/frontend_service/Makefile deleted file mode 100644 index 0264234f3..000000000 --- a/code/ryzom/server/src/frontend_service/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = -DFAST_MIRROR $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../admin_modules \ - -lgame_share \ - -ladmin_modules \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -# The flags for the linker -LDFLAGS2 = -L$(RYZOM_PATH)/install/$(DIR_DBG_$(DBG))/lib \ - -lnelnet \ - -lxml2 \ - -L/usr/lib \ - -L/usr/X11R6/lib \ - -lc \ - -lgame_share \ - -lnelgeorges \ - -lnelmisc \ - -lxml2 \ - -lz \ - -lm \ - -lpthread \ - -lcrypt - - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = frontend_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/frontend_service/frontend_service.vcproj b/code/ryzom/server/src/frontend_service/frontend_service.vcproj deleted file mode 100644 index 482945c51..000000000 --- a/code/ryzom/server/src/frontend_service/frontend_service.vcproj +++ /dev/null @@ -1,600 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/gameplay_module_lib/Makefile b/code/ryzom/server/src/gameplay_module_lib/Makefile deleted file mode 100644 index 34c8fbcd0..000000000 --- a/code/ryzom/server/src/gameplay_module_lib/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. \ - -I. - -# The flags for the linker -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../admin_modules \ - -lnelnet \ - -L/usr/lib \ - -L/usr/X11R6/lib \ - -lnelmisc \ - -lxml2 \ - -lpthread - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = libgameplay_module_lib.a -DSP_TARGET = gameplay_module_lib.vcproj - -# The default build rule -all: check-deps $(TARGETS) - - -#libgame_share.so: $(OBJS) -# $(CXX) -o $@ $(OBJS) -shared $(LDFLAGS) - -libgameplay_module_lib.a: $(OBJS) - ar r libgameplay_module_lib.a $(OBJS) - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/gameplay_module_lib/gameplay_module_lib.vcproj b/code/ryzom/server/src/gameplay_module_lib/gameplay_module_lib.vcproj deleted file mode 100644 index e2687987b..000000000 --- a/code/ryzom/server/src/gameplay_module_lib/gameplay_module_lib.vcproj +++ /dev/null @@ -1,349 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/gen_compile_flags.sh b/code/ryzom/server/src/gen_compile_flags.sh deleted file mode 100644 index 4cff3d457..000000000 --- a/code/ryzom/server/src/gen_compile_flags.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -FILENAME=../RyzomCompilerFlags.mk.$(hostname -s) - -if [ -e $FILENAME ] - then - echo RYZOM_VERSION_COMPILER_FLAGS=$(cat $FILENAME) -else - echo ERROR: File not found $FILENAME - exit 1 -fi diff --git a/code/ryzom/server/src/gen_deps.sh b/code/ryzom/server/src/gen_deps.sh deleted file mode 100755 index 45f41e17f..000000000 --- a/code/ryzom/server/src/gen_deps.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -command='' -sources='' -phase=0 -for arg in $* -do - if [ "$phase" == 0 ] && [ "$arg" == '--' ] - then - phase=1 - elif [ "$phase" == 0 ] - then - command="$command $arg" - elif [ "$phase" == 1 ] - then - sources="$sources $arg" - fi -done - -for src in $sources -do - obj=`echo $src | sed -e 's/.cpp$/.o/'` - $command -MT $obj -M $src -done - diff --git a/code/ryzom/server/src/general_utilities_service/Makefile b/code/ryzom/server/src/general_utilities_service/Makefile deleted file mode 100644 index e8a5cac5e..000000000 --- a/code/ryzom/server/src/general_utilities_service/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -lgame_share \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = general_utilities_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/general_utilities_service/general_utilities_service.vcproj b/code/ryzom/server/src/general_utilities_service/general_utilities_service.vcproj deleted file mode 100644 index 8ce47feb6..000000000 --- a/code/ryzom/server/src/general_utilities_service/general_utilities_service.vcproj +++ /dev/null @@ -1,649 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/gpm_service/Makefile b/code/ryzom/server/src/gpm_service/Makefile deleted file mode 100644 index d5d334a94..000000000 --- a/code/ryzom/server/src/gpm_service/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../server_share \ - -L../admin_modules \ - -lserver_share \ - -lgame_share \ - -ladmin_modules \ - -lnelligo \ - -lnelpacs \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = gpm_service -DSP_TARGET = $(TARGETS).vcproj -PACKED_SHEETS = \ - continents.packed_sheets \ - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a \ - ../server_share/libserver_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: $(TARGETS) - /bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS) - - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/gpm_service/gpm_service.vcproj b/code/ryzom/server/src/gpm_service/gpm_service.vcproj deleted file mode 100644 index 1fa450afe..000000000 --- a/code/ryzom/server/src/gpm_service/gpm_service.vcproj +++ /dev/null @@ -1,460 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/input_output_service/Makefile b/code/ryzom/server/src/input_output_service/Makefile deleted file mode 100644 index 7bfebd27d..000000000 --- a/code/ryzom/server/src/input_output_service/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../server_share \ - -L../pd_lib \ - -L../admin_modules \ - -lpd_lib \ - -lserver_share \ - -lgame_share \ - -ladmin_modules \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = input_output_service -DSP_TARGET = $(TARGETS).vcproj -PACKED_SHEETS = \ - ios_sheets.packed_sheets \ - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a \ - ../pd_lib/libpd_lib.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: $(TARGETS) - /bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS) - - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/input_output_service/input_output_service.vcproj b/code/ryzom/server/src/input_output_service/input_output_service.vcproj deleted file mode 100644 index b5d071296..000000000 --- a/code/ryzom/server/src/input_output_service/input_output_service.vcproj +++ /dev/null @@ -1,480 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/log_analyser_service/Makefile b/code/ryzom/server/src/log_analyser_service/Makefile deleted file mode 100644 index cd46cc580..000000000 --- a/code/ryzom/server/src/log_analyser_service/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../pd_lib \ - -L../admin_modules \ - -lpd_lib \ - -lgame_share \ - -lnelgeorges \ - -ladmin_modules \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = log_analyser_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/log_analyser_service/log_analyser_service.vcproj b/code/ryzom/server/src/log_analyser_service/log_analyser_service.vcproj deleted file mode 100644 index db3077368..000000000 --- a/code/ryzom/server/src/log_analyser_service/log_analyser_service.vcproj +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/logger_service/Makefile b/code/ryzom/server/src/logger_service/Makefile deleted file mode 100644 index e8f35c85e..000000000 --- a/code/ryzom/server/src/logger_service/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L../server_share \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../admin_modules \ - -lserver_share \ - -lgame_share \ - -lnelnet \ - -lnelmisc \ - -ladmin_modules \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = logger_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - ../server_share/libserver_share.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/logger_service/logger_service.vcproj b/code/ryzom/server/src/logger_service/logger_service.vcproj deleted file mode 100644 index b32ccca3c..000000000 --- a/code/ryzom/server/src/logger_service/logger_service.vcproj +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/mail_forum_service/Makefile b/code/ryzom/server/src/mail_forum_service/Makefile deleted file mode 100644 index d55ed2c8f..000000000 --- a/code/ryzom/server/src/mail_forum_service/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../server_share \ - -L../admin_modules \ - -ladmin_modules \ - -lserver_share \ - -lgame_share \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = mail_forum_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - ../server_share/libserver_share.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/mail_forum_service/mail_forum_service.vcproj b/code/ryzom/server/src/mail_forum_service/mail_forum_service.vcproj deleted file mode 100644 index 9d87815d3..000000000 --- a/code/ryzom/server/src/mail_forum_service/mail_forum_service.vcproj +++ /dev/null @@ -1,420 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/mirror_service/Makefile b/code/ryzom/server/src/mirror_service/Makefile deleted file mode 100644 index 55fcdbfe9..000000000 --- a/code/ryzom/server/src/mirror_service/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../admin_modules \ - -lgame_share \ - -ladmin_modules \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt \ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = mirror_service -DSP_TARGET = $(TARGETS).vcproj -PACKED_SHEETS = \ - datasets.packed_sheets \ - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: $(TARGETS) - /bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS) - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/mirror_service/mirror_service.vcproj b/code/ryzom/server/src/mirror_service/mirror_service.vcproj deleted file mode 100644 index 2eaa78170..000000000 --- a/code/ryzom/server/src/mirror_service/mirror_service.vcproj +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/monitor_service/Makefile b/code/ryzom/server/src/monitor_service/Makefile deleted file mode 100644 index 6fd930c8d..000000000 --- a/code/ryzom/server/src/monitor_service/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I/usr/include/mysql \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -lgame_share \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lmysqlclient \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = monitor_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/monitor_service/monitor_service.vcproj b/code/ryzom/server/src/monitor_service/monitor_service.vcproj deleted file mode 100644 index 0a4b289f2..000000000 --- a/code/ryzom/server/src/monitor_service/monitor_service.vcproj +++ /dev/null @@ -1,432 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/patchman_service/Makefile b/code/ryzom/server/src/patchman_service/Makefile deleted file mode 100644 index 871805240..000000000 --- a/code/ryzom/server/src/patchman_service/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I/usr/include/mysql \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -lmysqlclient \ - -lgame_share \ - -lnelnet \ - -lnelmisc \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = patchman_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/pd_lib/Makefile b/code/ryzom/server/src/pd_lib/Makefile deleted file mode 100644 index fce71f9aa..000000000 --- a/code/ryzom/server/src/pd_lib/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. \ - -I. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -lnelnet \ - -L/usr/lib \ - -L/usr/X11R6/lib \ - -lnelmisc \ - -lxml2 \ - -lpthread \ - -lgame_share - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = libpd_lib.a -DSP_TARGET = pd_lib.vcproj - -# The default build rule -all: check-deps $(TARGETS) - - -#libgame_share.so: $(OBJS) -# $(CXX) -o $@ $(OBJS) -shared $(LDFLAGS) - -libpd_lib.a: $(OBJS) - ar r libpd_lib.a $(OBJS) - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/pd_lib/pd_lib.vcproj b/code/ryzom/server/src/pd_lib/pd_lib.vcproj deleted file mode 100644 index d04ce84e8..000000000 --- a/code/ryzom/server/src/pd_lib/pd_lib.vcproj +++ /dev/null @@ -1,417 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/pd_reference_builder/Makefile b/code/ryzom/server/src/pd_reference_builder/Makefile deleted file mode 100644 index b234dfe0b..000000000 --- a/code/ryzom/server/src/pd_reference_builder/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../pd_lib \ - -lpd_lib \ - -lgame_share \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = reference_builder_service -DSP_TARGET = pd_reference_builder.vcproj - -# The default build rule -all: check-deps $(TARGETS) - -reference_builder_service: $(OBJS) - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/pd_reference_builder/pd_reference_builder.vcproj b/code/ryzom/server/src/pd_reference_builder/pd_reference_builder.vcproj deleted file mode 100644 index 567c8d943..000000000 --- a/code/ryzom/server/src/pd_reference_builder/pd_reference_builder.vcproj +++ /dev/null @@ -1,372 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/pd_support_service/Makefile b/code/ryzom/server/src/pd_support_service/Makefile deleted file mode 100644 index fbfd9ec54..000000000 --- a/code/ryzom/server/src/pd_support_service/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../server_share \ - -L../admin_modules \ - -lgame_share \ - -lserver_share \ - -lnelnet \ - -lnelmisc \ - -ladmin_modules \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = pd_support_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a \ - ../server_share/libserver_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/pd_support_service/pd_support_service.vcproj b/code/ryzom/server/src/pd_support_service/pd_support_service.vcproj deleted file mode 100644 index c0a8cbd85..000000000 --- a/code/ryzom/server/src/pd_support_service/pd_support_service.vcproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/persistant_data_service/Makefile b/code/ryzom/server/src/persistant_data_service/Makefile deleted file mode 100644 index 55c169b80..000000000 --- a/code/ryzom/server/src/persistant_data_service/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../pd_lib \ - -lpd_lib \ - -lgame_share \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = persistant_data_service -DSP_TARGET = $(TARGETS).dsp - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/persistant_data_service/persistant_data_service.vcproj b/code/ryzom/server/src/persistant_data_service/persistant_data_service.vcproj deleted file mode 100644 index 8bd6cc9ab..000000000 --- a/code/ryzom/server/src/persistant_data_service/persistant_data_service.vcproj +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/ryzom_admin_service/Makefile b/code/ryzom/server/src/ryzom_admin_service/Makefile deleted file mode 100644 index d2fdbf0e9..000000000 --- a/code/ryzom/server/src/ryzom_admin_service/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L../admin_modules \ - -ladmin_modules \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = ryzom_admin_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.vcproj b/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.vcproj deleted file mode 100644 index 738debe33..000000000 --- a/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.vcproj +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/ryzom_naming_service/Makefile b/code/ryzom/server/src/ryzom_naming_service/Makefile deleted file mode 100644 index 89234b94d..000000000 --- a/code/ryzom/server/src/ryzom_naming_service/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L../admin_modules \ - -lnelnet \ - -lnelmisc \ - -ladmin_modules \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = ryzom_naming_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.vcproj b/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.vcproj deleted file mode 100644 index d87909004..000000000 --- a/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.vcproj +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/ryzom_welcome_service/Makefile b/code/ryzom/server/src/ryzom_welcome_service/Makefile deleted file mode 100644 index 279986552..000000000 --- a/code/ryzom/server/src/ryzom_welcome_service/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L../admin_modules \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -lgame_share \ - -lnelnet \ - -lnelmisc \ - -ladmin_modules \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = ryzom_welcome_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.vcproj b/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.vcproj deleted file mode 100644 index c223fb76a..000000000 --- a/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.vcproj +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/server_share/Makefile b/code/ryzom/server/src/server_share/Makefile deleted file mode 100644 index cf00f3aae..000000000 --- a/code/ryzom/server/src/server_share/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################# -# Simple make file for compiling GAME SHARE - -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I/usr/include/mysql \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_PATH)/common/src \ - -I./ \ - -I./character_structure \ - -I./egs_sheets \ - -I./entity_structure \ - -I./game_item_manager - -# The flags for the linker -LDFLAGS = $(LD_FLAGS_CMN) -L$(RYZOM_PATH)/install/$(DIR_DBG_$(DBG))/lib \ - -llibmysqlclient \ - -lnelnet \ - -lnelgeorges \ - -lnelpacs \ - -L/usr/lib \ - -L/usr/X11R6/lib \ - -lnelmisc \ - -lxml2 \ - -lstlport \ - -lpthread \ - -lld - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = libserver_share.a -DSP_TARGET = server_share.vcproj - -# The default build rule -all: check-deps $(TARGETS) - - -#libgame_share.so: $(OBJS) -# $(CXX) -o $@ $(OBJS) -shared $(LDFLAGS) - -libserver_share.a: $(OBJS) - ar r libserver_share.a $(OBJS) - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/server_share/server_share.vcproj b/code/ryzom/server/src/server_share/server_share.vcproj deleted file mode 100644 index 0a47ea263..000000000 --- a/code/ryzom/server/src/server_share/server_share.vcproj +++ /dev/null @@ -1,806 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/session_browser_server/Makefile b/code/ryzom/server/src/session_browser_server/Makefile deleted file mode 100644 index d7612c98f..000000000 --- a/code/ryzom/server/src/session_browser_server/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I/usr/include/mysql \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. \ - -I. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../admin_modules \ - -L../server_share \ - -lmysqlclient \ - -lserver_share \ - -lgame_share \ - -ladmin_modules \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = session_browser_server -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) \ - ../admin_modules/libadmin_modules.a \ - ../server_share/libserver_share.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/session_browser_server/session_browser_server.vcproj b/code/ryzom/server/src/session_browser_server/session_browser_server.vcproj deleted file mode 100644 index 6f9476a0a..000000000 --- a/code/ryzom/server/src/session_browser_server/session_browser_server.vcproj +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/shard_unifier_service/Makefile b/code/ryzom/server/src/shard_unifier_service/Makefile deleted file mode 100644 index e3d3fb9a3..000000000 --- a/code/ryzom/server/src/shard_unifier_service/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I/usr/include/mysql \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. \ - -I. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../admin_modules \ - -L../server_share \ - -lmysqlclient \ - -lserver_share \ - -lgame_share \ - -ladmin_modules \ - -lnelgeorges \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = shard_unifier_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) \ - ../admin_modules/libadmin_modules.a \ - ../server_share/libserver_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk diff --git a/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.vcproj b/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.vcproj deleted file mode 100644 index fa67ae0f8..000000000 --- a/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.vcproj +++ /dev/null @@ -1,468 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/tick_service/Makefile b/code/ryzom/server/src/tick_service/Makefile deleted file mode 100644 index 5afedf0bd..000000000 --- a/code/ryzom/server/src/tick_service/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../admin_modules \ - -lgame_share \ - -lnelgeorges \ - -ladmin_modules \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = tick_service -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../../Rules.mk - diff --git a/code/ryzom/server/src/tick_service/tick_service.vcproj b/code/ryzom/server/src/tick_service/tick_service.vcproj deleted file mode 100644 index 2fc70db5b..000000000 --- a/code/ryzom/server/src/tick_service/tick_service.vcproj +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/server/src/update_cxxpath_flags.sh b/code/ryzom/server/src/update_cxxpath_flags.sh deleted file mode 100755 index 2cdba81a5..000000000 --- a/code/ryzom/server/src/update_cxxpath_flags.sh +++ /dev/null @@ -1 +0,0 @@ -echo CXXPATHS=$(pwd |cut -d/ -f1-5) > Variables2.mk diff --git a/code/ryzom/server/src/update_packed_sheets.sh b/code/ryzom/server/src/update_packed_sheets.sh deleted file mode 100755 index 0c98eef45..000000000 --- a/code/ryzom/server/src/update_packed_sheets.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# make sure the args are valid -if [ $# -lt 2 ] -then - echo SYNTAX: $0 \ \[\...\[\...\]\] - exit -fi - -# extract the executable name (as the first arg) -EXE_NAME=$1 -shift - -# run through the remaining args checking that files of the given names exist -REQUIRE_REBUILD=0 -while [ $# -gt 0 ] -do - if [ ! -e $1 ] - then - REQUIRE_REBUILD=1 - fi - shift -done - -# if one of the files was missing then call the executable to rebuild the packed sheets -if [ $REQUIRE_REBUILD == 1 ] -then - PACK_SHEETS_FLAGS=`grep PACK_SHEETS_FLAGS ../../../Variables.mk|cut -f2 -d=` - PACK_SHEETS_FLAGS=`eval echo $PACK_SHEETS_FLAGS` - echo "$EXE_NAME $PACK_SHEETS_FLAGS" - $EXE_NAME $PACK_SHEETS_FLAGS -fi diff --git a/code/ryzom/tools/pdr_util/Makefile b/code/ryzom/tools/pdr_util/Makefile deleted file mode 100644 index 6835f1248..000000000 --- a/code/ryzom/tools/pdr_util/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################# -# Setting up the compiler settings... - -# Global variables -include ../../Variables.mk - -# The flags for the C++ compiler -CXXFLAGS = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \ - -I/usr/include/libxml2 \ - -I$(NEL_INCLUDE) \ - -I$(RYZOM_COMMON_SRC) \ - -I.. - -LDFLAGS = $(LD_FLAGS_CMN) \ - -L$(NEL_PATH)/lib \ - -L$(RYZOM_COMMON_SRC)/game_share \ - -L../../server/src/server_share \ - -lgame_share \ - -lserver_share \ - -lnelnet \ - -lnelmisc \ - -lxml2 \ - -lrt\ - -ldl - -############################################################################# -# The bit that changes each time we cut paste and hack this file :o) - -# The list of targets to build -TARGETS = pdr_util -DSP_TARGET = $(TARGETS).vcproj - -# The default build rule -all: exe packed_sheets - -exe: check-deps $(TARGETS) - -$(TARGETS): $(OBJS) \ - $(RYZOM_COMMON_SRC)/game_share/libgame_share.a \ - ../../server/src/server_share/libserver_share.a - $(CXX) -o $@ $(OBJS) $(LDFLAGS) - cp -a $(TARGETS) $(TARGETS)_debug - strip $(TARGETS) - -packed_sheets: -# this service has no packed_sheets to pack -# ./$(TARGETS) $(PACK_SHEETS_FLAGS) - - -############################################################################# -# Rules - -include ../../Rules.mk - diff --git a/code/snowballs2/Makefile.am b/code/snowballs2/Makefile.am deleted file mode 100644 index 8e8eb83a5..000000000 --- a/code/snowballs2/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in configure config.guess missing \ - config.sub ltconfig aclocal.m4 config.h.in \ - install-sh mkinstalldirs - -EXTRA_DIST = autogen.sh \ - snowballs2.dsw \ - snowballs2.sln \ - snowballs2_8.sln \ - kdevelop - -DIST_SUBDIRS = client server - -dist-hook: - find $(distdir) -name CVS -print | xargs rm -fr - find $(distdir) -name .svn -print | xargs rm -fr - -SUBDIRS = @SNO_SUBDIRS@ - -# End of Makefile.am - diff --git a/code/snowballs2/acinclude.m4 b/code/snowballs2/acinclude.m4 deleted file mode 100644 index f34400c1d..000000000 --- a/code/snowballs2/acinclude.m4 +++ /dev/null @@ -1,1213 +0,0 @@ -# ========================================================================= -# -# Macros used by Nevrax in configure.in files. -# -# ========================================================================= - -# ========================================================================= -# WARNING: The original version of this file is placed in the $CVSROOT/code -# directory. -# There is links in the $CVSROOT/code sub-directories to that file -# (ex: $CVSROOT/code/nel), so be careful of the consequences of -# any modification of that file. -# ========================================================================= - -# ========================================================================= -# Macros available in that file. -# -# -# AM_NEL_DEBUG -# -# Option: none. -# Description: manage the different debug and the release mode by setting -# correctly the CFLAGS and CXXFLAGS variables. -# -# -# AM_PATH_NEL -# -# Option: none. -# Description: check the instalation of the NeL library and set the -# CXXFLAGS and LIBS variables to use it. -# -# -# AM_PATH_OPENGL -# -# Option: "yes" if the use of the OpenGL library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# OPENGL_CFLAGS and OPENGL_LIBS variables to use it. -# -# -# AM_PATH_FREETYPE -# -# Option: "yes" if the use of the Freetype library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# FREETYPE_CFLAGS and FREETYPE_LIBS variables to use it. -# -# -# AM_PATH_XF86VIDMODE -# -# Option: none. -# Description: check the instalation of the OpenGL library and set the -# XF86VIDMODE_CFLAGS and XF86VIDMODE_LIBS variables to use it. -# -# -# AM_PATH_OPENAL -# -# Option: "yes" if the use of the OpenAL library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# OPENAL_CFLAGS and OPENAL_LIBS variables to use it. -# -# -# AM_PATH_PYTHON -# -# Option: "yes" if the use of the Python library is mandatory. -# Description: check the instalation of the OpenGL library and set the -# PYTHON_CFLAGS and PYTHON_LIBS variables to use it. -# -# ========================================================================= - - -# ========================================================================= -# AM_NEL_DEBUG - -AC_DEFUN([AM_NEL_DEBUG], -[ - -MAX_C_OPTIMIZE="-O6" - -NL_DEBUG="-DNL_DEBUG" -NL_RELEASE="-DNL_RELEASE" - -AC_ARG_WITH(debug, - [ --with-debug[=full|medium|fast] - Build a debug version (huge libraries). - Full mode set only NeL. - Medium mode set NeL debug flags with inline - optimization (default mode). - Fast mode is like the Medium mode with some basic - optimization. - --without-debug Build without debugging code (default)], - [with_debug=$withval], - [with_debug=no]) - -# Build optimized or debug version ? -# First check for gcc and g++ -if test "$ac_cv_prog_gcc" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" - OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" -else - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="" - OPTIMIZE_CFLAGS="" -fi - -if test "$ac_cv_prog_cxx_g" = "yes" -then - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="-O" - OPTIMIZE_CXXFLAGS="-O3" - OPTIMIZE_INLINE_CXXFLAGS="-finline-functions" -else - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="" - OPTIMIZE_INLINE_CXXFLAGS="" -fi - -if test "$with_debug" = "yes" -o "$with_debug" = "medium" -then - # Medium debug. Inline optimization - CFLAGS="$DEBUG_CFLAGS $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS" -else - if test "$with_debug" = "full" - then - # Full debug. Very slow in some cases - CFLAGS="$DEBUG_CFLAGS $NL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $NL_DEBUG $CXXFLAGS" - else - if test "$with_debug" = "fast" - then - # Fast debug. - CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS" - else - # Optimized version. No debug - CFLAGS="$OPTIMIZE_CFLAGS $NL_RELEASE $CFLAGS" - CXXFLAGS="$OPTIMIZE_CXXFLAGS $NL_RELEASE $CXXFLAGS" - fi - fi -fi - -# AC_MSG_RESULT([CFLAGS = $CFLAGS]) -# AC_MSG_RESULT([CXXGLAGS = $CXXFLAGS]) - -]) - - -# ========================================================================= -# MY_NEL_HEADER_CHK : NeL header files checking macros - -AC_DEFUN([MY_NEL_HEADER_CHK], -[ AC_REQUIRE_CPP() - -chk_message_obj="$1" -header="$2" -macro="$3" -is_mandatory="$4" - -if test $is_mandatory = "yes" -then - - _CPPFLAGS="$CPPFLAGS" - - CPPFLAGS="$CXXFLAGS $NEL_CFLAGS" - - AC_MSG_CHECKING(for $header) - - AC_EGREP_CPP( yo_header, -[#include <$header> -#ifdef $macro - yo_header -#endif], - have_header="yes", - have_header="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_header" = "yes" - then - AC_MSG_RESULT(yes) - else - if test "$is_mandatory" = "yes" - then - AC_MSG_ERROR([$chk_message_obj must be installed (http://dev.ryzom.com).]) - else - AC_MSG_RESULT(no) - fi - fi -fi - - -]) - - -# ========================================================================= -# MY_NEL_LIB_CHK : NeL library checking macros - -AC_DEFUN([MY_NEL_LIB_CHK], -[ AC_REQUIRE_CPP() - -chk_message_obj="$1" -nel_test_lib="$2" -is_mandatory="$3" - -if test $is_mandatory = "yes" -then - - AC_CHECK_LIB($nel_test_lib, main,,[AC_MSG_ERROR([$chk_message_obj must be installed (http://dev.ryzom.com).])]) -fi -]) - - -# ========================================================================= -# AM_PATH_NEL : NeL checking macros -AC_DEFUN([AM_PATH_NEL], -[ AC_REQUIRE_CPP() - -AC_ARG_WITH( nel, - [ --with-nel= path to the NeL install files directory. - e.g. /usr/local/nel]) - -AC_ARG_WITH( nel-include, - [ --with-nel-include= - path to the NeL header files directory. - e.g. /usr/local/nel/include]) - -AC_ARG_WITH( nel-lib, - [ --with-nel-lib= - path to the NeL library files directory. - e.g. /usr/local/nel/lib]) - - -nelmisc_is_mandatory="$1" -nelnet_is_mandatory="$2" -nel3d_is_mandatory="$3" -nelpacs_is_mandatory="$4" -nelsound_is_mandatory="$5" -nelai_is_mandatory="$6" -nelgeorges_is_mandatory="$7" - -# Check for nel-config -AC_PATH_PROG(NEL_CONFIG, nel-config, no) - -# -# Configure options (--with-nel*) have precendence -# over nel-config only set variables if they are not -# specified -# -if test "$NEL_CONFIG" != "no" -then - if test -z "$with_nel" -a -z "$with_nel_include" - then - CXXFLAGS="$CXXFLAGS `nel-config --cflags`" - fi - - if test -z "$with_nel" -a -z "$with_nel_lib" - then - LDFLAGS="`nel-config --ldflags` $LDFLAGS" - fi -fi - -# -# Set nel_libraries and nel_includes according to -# user specification (--with-nel*) if any. -# --with-nel-include and --with-nel-lib have precendence -# over --with-nel -# -if test "$with_nel" = "no" -then - # The user explicitly disabled the use of the NeL - AC_MSG_ERROR([NeL is mandatory: do not specify --without-nel]) -else - if test "$with_nel" -a "$with_nel" != "yes" - then - nel_includes="$with_nel/include" - nel_libraries="$with_nel/lib" - fi -fi - -if test "$with_nel_include" -then - nel_includes="$with_nel_include" -fi - -if test "$with_nel_lib" -then - nel_libraries="$with_nel_lib" -fi - -# -# Set compilation variables -# -if test "$nel_includes" -then - CXXFLAGS="$CXXFLAGS -I$nel_includes" -fi - -if test "$nel_libraries" -then - LDFLAGS="-L$nel_libraries $LDFLAGS" -fi - -# -# Collect headers information and bark if missing and -# mandatory -# - -MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory) -MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory) -MY_NEL_HEADER_CHK([NeL 3D], [nel/3d/u_camera.h], [NL_U_CAMERA_H], $nel3d_is_mandatory) -MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory) -MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory) -MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory) -MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory) - -# -# Collect libraries information and bark if missing and -# mandatory -# - -MY_NEL_LIB_CHK([NeL Misc], [nelmisc], $nelmisc_is_mandatory) -MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory) -MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory) -MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory) -MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory) -MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory) -MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory) - -]) - -# ========================================================================= -# AM_PATH_OPENGL : OpenGL checking macros - -AC_DEFUN([AM_PATH_OPENGL], -[ AC_MSG_CHECKING(for OpenGL headers and GL Version >= 1.2) - -is_mandatory="$1" - -AC_REQUIRE_CPP() - -AC_ARG_WITH( opengl, - [ --with-opengl= path to the OpenGL install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( opengl-include, - [ --with-opengl-include= - path to the OpenGL header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( opengl-lib, - [ --with-opengl-lib= - path to the OpenGL library files directory. - e.g. /usr/local/lib]) - -opengl_lib="GL" - -if test "$with_opengl" -then - opengl_includes="$with_opengl/include" - opengl_libraries="$with_opengl/lib" -fi - -if test "$with_opengl_include" -then - opengl_includes="$with_opengl_include" -fi - -if test "$with_opengl_lib" -then - opengl_libraries="$with_opengl_lib" -fi - -# Set OPENGL_CFLAGS -if test "$opengl_includes" -then - OPENGL_CFLAGS="-I$opengl_includes" -fi - -# Set OPENGL_LIBS -if test "$opengl_libraries" -then - OPENGL_LIBS="-L$opengl_libraries" -fi -OPENGL_LIBS="$OPENGL_LIBS -l$opengl_lib" - -# Test the headers -_CPPFLAGS="$CPPFLAGS" - -CPPFLAGS="$CXXFLAGS $OPENGL_CFLAGS" - -AC_EGREP_CPP( yo_opengl, -[#include -#if defined(GL_VERSION_1_2) - yo_opengl -#endif], - have_opengl_headers="yes", - have_opengl_headers="no" ) - -if test "$have_opengl_headers" = "yes" -then - if test "$opengl_includes" - then - AC_MSG_RESULT([$opengl_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Checking the GLEXT version >= 7 -AC_MSG_CHECKING(for and GLEXT version >= 7) - -AC_EGREP_CPP( yo_glext_version, -[#include -#ifdef GL_GLEXT_VERSION -#if GL_GLEXT_VERSION >= 7 - yo_glext_version -#endif -#endif], - have_glext="yes", - have_glext="no" ) - -if test "$have_glext" = "yes" -then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT([no, can be downloaded from http://www.opengl.org/registry/]) -fi - -# Test the libraries -AC_MSG_CHECKING(for OpenGL libraries) - -CPPFLAGS="$CXXFLAGS $OPENGL_LIBS" - -AC_TRY_LINK( , , have_opengl_libraries="yes", have_opengl_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_opengl_libraries" = "yes" -then - if test "$opengl_libraries" - then - AC_MSG_RESULT([$opengl_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -opengl_libraries="$opengl_libraries" - -if test "$have_opengl_headers" = "yes" \ - -a "$have_glext" = "yes" \ - -a "$have_opengl_libraries" = "yes" -then - have_opengl="yes" -else - have_opengl="no" -fi - -if test "$have_opengl" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([OpenGL >= 1.2 must be installed (http://www.mesa3d.org)]) -fi - -AC_SUBST(OPENGL_CFLAGS) -AC_SUBST(OPENGL_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_FREETYPE : FreeType checking macros - -AC_DEFUN([AM_PATH_FREETYPE], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -AC_ARG_WITH( freetype, - [ --with-freetype= path to the FreeType install files directory. - e.g. /usr/local/freetype]) - -AC_ARG_WITH( freetype-include, - [ --with-freetype-include= - path to the FreeType header files directory. - e.g. /usr/local/freetype/include]) - -AC_ARG_WITH( freetype-lib, - [ --with-freetype-lib= - path to the FreeType library files directory. - e.g. /usr/local/freetype/lib]) - -freetype_lib="freetype" - - -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) - -if test "$FREETYPE_CONFIG" = "no" -then - have_freetype_config="no" -else - FREETYPE_CFLAGS=`freetype-config --cflags` - FREETYPE_LIBS=`freetype-config --libs` - have_freetype_config="yes" -fi - -if test "$with_freetype" -then - freetype_includes="$with_freetype/include" - freetype_libraries="$with_freetype/lib" -fi - -if test "$with_freetype_include" -then - freetype_includes="$with_freetype_include" -fi - -if test "$with_freetype_lib" -then - freetype_libraries="$with_freetype_lib" -fi - -if test "$freetype_includes" -then - FREETYPE_CFLAGS="-I$freetype_includes" -fi - -# Checking the FreeType 2 instalation -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS" - -AC_MSG_CHECKING(for FreeType version = 2) - -AC_EGREP_CPP( yo_freetype2, -[#include -#if FREETYPE_MAJOR == 2 - yo_freetype2 -#endif], - have_freetype2="yes", - have_freetype2="no") - -if test "$have_freetype2" = "yes" -then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for FreeType libraries) - -if test $freetype_libraries -then - FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib" -fi - -CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS" - -AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_freetype_libraries" = "yes" -then - if test "$freetype_libraries" - then - AC_MSG_RESULT([$freetype_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -if test "$have_freetype2" = "yes" && test "$have_freetype_libraries" = "yes" -then - have_freetype="yes" -else - have_freetype="no" -fi - -if test "$have_freetype" = "no" && test "$is_mandatory" = "yes" -then - AC_MSG_ERROR([FreeType 2 must be installed (http://freetype.sourceforge.net)]) -fi - -AC_SUBST(FREETYPE_CFLAGS) -AC_SUBST(FREETYPE_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_XF86VIDMODE : XF86VidMode checking macros - -AC_DEFUN([AM_PATH_XF86VIDMODE], -[ AC_MSG_CHECKING(for XF86VidMode extension) - -AC_REQUIRE_CPP() - -AC_ARG_WITH( xf86vidmode-lib, - [ --with-xf86vidmode-lib= - path to the XF86VidMode library. - e.g. /usr/X11R6/lib] ) - -xf86vidmode_lib="Xxf86vm" - -if test "$with_xf86vidmode_lib" = no -then - # The user explicitly disabled the use of XF86VidMode - have_xf86vidmode="disabled" - AC_MSG_RESULT(disabled) -else - if test "$with_xf86vidmode_lib" - then - xf86vidmode_libraries="$with_xf86vidmode_lib" - fi - - XF86VIDMODE_CFLAGS="-DXF86VIDMODE" -fi - -if test -z "$have_xf86vidmode" -# -a "$with_xf86vidmode_lib" -then - if test "$xf86vidmode_libraries" - then - XF86VIDMODE_LIBS="-L$xf86vidmode_libraries" - fi - - XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS -l$xf86vidmode_lib" - - _CPPFLAGS="$CPPFLAGS" - - CPPFLAGS="$CXXFLAGS $XF86VIDMODE_LIBS" - - AC_TRY_LINK( , , have_xf86vidmode_libraries="yes", have_xf86vidmode_libraries="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_xf86vidmode_libraries" = "yes" - then - have_xf86vidmode="yes" - if test "$xf86vidmode_libraries" - then - AC_MSG_RESULT($xf86vidmode_libraries) - else - AC_MSG_RESULT(yes) - fi - else - have_xf86vidmode="no" - AC_MSG_RESULT(no, no fullscreen support available.) - fi - - xf86vidmode_libraries="$xf86vidmode_libraries" - -fi - -AC_SUBST(XF86VIDMODE_CFLAGS) -AC_SUBST(XF86VIDMODE_LIBS) - -]) - - -# ========================================================================= -# AM_PATH_OPENAL : OpenAL checking macros - -AC_DEFUN([AM_PATH_OPENAL], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the OpenAL files location -AC_ARG_WITH( openal, - [ --with-openal= path to the OpenAL install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( openal-include, - [ --with-openal-include= - path to the OpenAL header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( openal-lib, - [ --with-openal-lib= - path to the OpenAL library files directory. - e.g. /usr/local/lib]) - -openal_lib="openal" -alut_lib="alut" - -if test $with_openal -then - openal_includes="$with_openal/include" - openal_libraries="$with_openal/lib" -fi - -if test "$with_openal_include" -then - openal_includes="$with_openal_include" -fi - -if test "$with_openal_lib" -then - openal_libraries="$with_openal_lib" -fi - - -# Set OPENAL_CFLAGS -if test "$openal_includes" -then - OPENAL_CFLAGS="-I$openal_includes" -fi - -# Set OPENAL_LIBS -if test "$openal_libraries" -then - OPENAL_LIBS="-L$openal_libraries" -fi -OPENAL_LIBS="$OPENAL_LIBS -l$openal_lib -l$alut_lib" - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS" - -AC_MSG_CHECKING(for OpenAL headers) -AC_EGREP_CPP( yo_openal, -[#include -#include -#ifdef AL_VERSION - yo_openal -#endif], - have_openal_headers="yes", - have_openal_headers="no" ) - -if test "$have_openal_headers" = "yes" -then - if test "$openal_includes" - then - AC_MSG_RESULT([$openal_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for OpenAL libraries) - -CPPFLAGS="$CXXFLAGS $OPENAL_LIBS" - -AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_openal_libraries" = "yes" -then - if test "$openal_libraries" - then - AC_MSG_RESULT([$openal_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -openal_libraries="$openal_libraries" - -if test "$have_openal_headers" = "yes" \ - && test "$have_openal_libraries" = "yes" -then - have_openal="yes" -else - have_openal="no" -fi - -if test "$have_openal" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([OpenAL is needed to compile NeL (http://www.openal.org).]) -fi - -AC_SUBST(OPENAL_CFLAGS) -AC_SUBST(OPENAL_LIBS) -AC_SUBST([have_openal]) - -]) - - -# ========================================================================= -# AM_PATH_PYTHON : Python checking macros - -AC_DEFUN([AM_PATH_PYTHON], -[ python_version_required="$1" - -is_mandatory="$2" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the Python files location -AC_ARG_WITH( python, - [ --with-python= path to the Python prefix installation directory. - e.g. /usr/local], - [ PYTHON_PREFIX=$with_python ] -) - -AC_ARG_WITH( python-version, - [ --with-python-version= - Python version to use, e.g. 1.5], - [ PYTHON_VERSION=$with_python_version ] -) - -if test ! "$PYTHON_PREFIX" = "" -then - PATH="$PYTHON_PREFIX/bin:$PATH" -fi - -if test ! "$PYTHON_VERSION" = "" -then - PYTHON_EXEC="python$PYTHON_VERSION" -else - PYTHON_EXEC="python python2.1 python2.0 python1.5" -fi - -AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH) - -if test "$PYTHON" != "no" -then - PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'` - PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'` - - is_python_version_enough=`expr $python_version_required \<= $PYTHON_VERSION` -fi - - -if test "$PYTHON" = "no" || test "$is_python_version_enough" != "1" -then - - if test "$is_mandatory" = "yes" - then - AC_MSG_ERROR([Python $python_version_required must be installed (http://www.python.org)]) - else - have_python="no" - fi - -else - - python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION" - python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config" - python_lib="python$PYTHON_VERSION" - - PYTHON_CFLAGS="-I$python_includes" - PYTHON_LIBS="-L$python_libraries -l$python_lib" - - _CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CXXFLAGS ${PYTHON_CFLAGS}" - - # Test the headers - AC_MSG_CHECKING(for Python headers) - - AC_EGREP_CPP( yo_python, - [#include - yo_python - ], - have_python_headers="yes", - have_python_headers="no" ) - - if test "$have_python_headers" = "yes" - then - AC_MSG_RESULT([$python_includes]) - else - AC_MSG_RESULT(no) - fi - - # Test the libraries - AC_MSG_CHECKING(for Python libraries) - - CPPFLAGS="$CXXFLAGS $PYTHON_CFLAGS" - - AC_TRY_LINK( , , have_python_libraries="yes", have_python_libraries="no") - - CPPFLAGS="$_CPPFLAGS" - - if test "$have_python_libraries" = "yes" - then - if test "$python_libraries" - then - AC_MSG_RESULT([$python_libraries]) - else - AC_MSG_RESULT(yes) - fi - else - AC_MSG_RESULT(no) - fi - - if test "$have_python_headers" = "yes" \ - && test "$have_python_libraries" = "yes" - then - have_python="yes" - else - have_python="no" - fi - - if test "$have_python" = "no" -a "$is_mandatory" = "yes" - then - AC_MSG_ERROR([Python is needed to compile NeL (http://www.python.org).]) - fi - - AC_SUBST(PYTHON_CFLAGS) - AC_SUBST(PYTHON_LIBS) - -fi - -]) - -# ========================================================================= -# AM_PATH_MYSQL : MySQL library - -# AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -# Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS -# -AC_DEFUN([AM_PATH_MYSQL], -[# -# Get the cflags and libraries from the mysql_config script -# -AC_ARG_WITH(mysql-prefix,[ --with-mysql-prefix=PFX Prefix where MYSQL is installed (optional)], - mysql_prefix="$withval", mysql_prefix="") -AC_ARG_WITH(mysql-exec-prefix,[ --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)], - mysql_exec_prefix="$withval", mysql_exec_prefix="") -AC_ARG_ENABLE(mysqltest, [ --disable-mysqltest Do not try to compile and run a test MYSQL program], - , enable_mysqltest=yes) - - if test x$mysql_exec_prefix != x ; then - mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix" - if test x${MYSQL_CONFIG+set} != xset ; then - MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config - fi - fi - if test x$mysql_prefix != x ; then - mysql_args="$mysql_args --prefix=$mysql_prefix" - if test x${MYSQL_CONFIG+set} != xset ; then - MYSQL_CONFIG=$mysql_prefix/bin/mysql_config - fi - fi - - AC_REQUIRE([AC_CANONICAL_TARGET]) - AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no) - min_mysql_version=ifelse([$1], ,0.11.0,$1) - AC_MSG_CHECKING(for MYSQL - version >= $min_mysql_version) - no_mysql="" - if test "$MYSQL_CONFIG" = "no" ; then - no_mysql=yes - else - MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"` - MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"` - - mysql_major_version=`$MYSQL_CONFIG $mysql_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - mysql_minor_version=`$MYSQL_CONFIG $mysql_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - mysql_micro_version=`$MYSQL_CONFIG $mysql_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_mysqltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $MYSQL_CFLAGS" - LIBS="$LIBS $MYSQL_LIBS" -# -# Now check if the installed MYSQL is sufficiently new. (Also sanity -# checks the results of mysql_config to some extent -# - rm -f conf.mysqltest - AC_TRY_RUN([ -#include -#include -#include -#include - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.mysqltest"); - */ - { FILE *fp = fopen("conf.mysqltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_mysql_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_mysql_version"); - exit(1); - } - - if (($mysql_major_version > major) || - (($mysql_major_version == major) && ($mysql_minor_version > minor)) || - (($mysql_major_version == major) && ($mysql_minor_version == minor) && ($mysql_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'mysql_config --version' returned %d.%d.%d, but the minimum version\n", $mysql_major_version, $mysql_minor_version, $mysql_micro_version); - printf("*** of MYSQL required is %d.%d.%d. If mysql_config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If mysql_config was wrong, set the environment variable MYSQL_CONFIG\n"); - printf("*** to point to the correct copy of mysql_config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_mysql=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_mysql" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$MYSQL_CONFIG" = "no" ; then - echo "*** The mysql_config script installed by MYSQL could not be found" - echo "*** If MYSQL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the MYSQL_CONFIG environment variable to the" - echo "*** full path to mysql_config." - else - if test -f conf.mysqltest ; then - : - else - echo "*** Could not run MYSQL test program, checking why..." - CFLAGS="$CFLAGS $MYSQL_CFLAGS" - LIBS="$LIBS $MYSQL_LIBS" - AC_TRY_LINK([ -#include -#include - -int main(int argc, char *argv[]) -{ return 0; } -#undef main -#define main K_and_R_C_main -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding MYSQL or finding the wrong" - echo "*** version of MYSQL. If it is not finding MYSQL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means MYSQL was incorrectly installed" - echo "*** or that you have moved MYSQL since it was installed. In the latter case, you" - echo "*** may want to edit the mysql_config script: $MYSQL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - MYSQL_CFLAGS="" - MYSQL_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(MYSQL_CFLAGS) - AC_SUBST(MYSQL_LIBS) - rm -f conf.mysqltest -]) - -# ========================================================================= -# AM_PATH_FMOD : FMOD checking macros - -AC_DEFUN([AM_PATH_FMOD], -[ is_mandatory="$1" - -AC_REQUIRE_CPP() - -# Get from the user option the path to the FMOD files location -AC_ARG_WITH( fmod, - [ --with-fmod= path to the FMOD install files directory. - e.g. /usr/local]) - -AC_ARG_WITH( fmod-include, - [ --with-fmod-include= - path to the FMOD header files directory. - e.g. /usr/local/include]) - -AC_ARG_WITH( fmod-lib, - [ --with-fmod-lib= - path to the FMOD library files directory. - e.g. /usr/local/lib]) - -fmod_lib="fmod" - -if test $with_fmod -then - fmod_includes="$with_fmod/include" - fmod_libraries="$with_fmod/lib" -fi - -if test "$with_fmod_include" -then - fmod_includes="$with_fmod_include" -fi - -if test "$with_fmod_lib" -then - fmod_libraries="$with_fmod_lib" -fi - - -# Set FMOD_CFLAGS -if test "$fmod_includes" -then - FMOD_CFLAGS="-I$fmod_includes" -fi - -# Set FMOD_LIBS -if test "$fmod_libraries" -then - FMOD_LIBS="-L$fmod_libraries" -fi -FMOD_LIBS="$FMOD_LIBS -l$fmod_lib" - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS $FMOD_CFLAGS" - -AC_MSG_CHECKING(for FMOD headers) -AC_EGREP_CPP( yo_fmod, -[#include -#ifdef FMOD_VERSION - yo_fmod -#endif], - have_fmod_headers="yes", - have_fmod_headers="no" ) - -if test "$have_fmod_headers" = "yes" -then - if test "$fmod_includes" - then - AC_MSG_RESULT([$fmod_includes]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -# Test the libraries -AC_MSG_CHECKING(for FMOD libraries) - -CPPFLAGS="$CXXFLAGS $FMOD_LIBS" - -AC_TRY_LINK( , , have_fmod_libraries="yes", have_fmod_libraries="no") - -CPPFLAGS="$_CPPFLAGS" - -if test "$have_fmod_libraries" = "yes" -then - if test "$fmod_libraries" - then - AC_MSG_RESULT([$fmod_libraries]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -fmod_libraries="$fmod_libraries" - -if test "$have_fmod_headers" = "yes" \ - && test "$have_fmod_libraries" = "yes" -then - have_fmod="yes" -else - have_fmod="no" -fi - -if test "$have_fmod" = "no" -a "$is_mandatory" = "yes" -then - AC_MSG_ERROR([FMOD is needed to compile NeL (http://www.fmod.org).]) -fi - -AC_SUBST(FMOD_CFLAGS) -AC_SUBST(FMOD_LIBS) -AC_SUBST([have_fmod]) - -]) - -# ========================================================================= -# End of file - diff --git a/code/snowballs2/autogen.sh b/code/snowballs2/autogen.sh deleted file mode 100755 index 934ea0041..000000000 --- a/code/snowballs2/autogen.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - - -WANT_AUTOMAKE="1.6" - -case `uname -s` in -Darwin) - LIBTOOLIZE=glibtoolize - ;; -*) - LIBTOOLIZE=libtoolize - ;; -esac - -echo "Creating macros..." && \ -aclocal && \ -echo "Creating library tools..." && \ -$LIBTOOLIZE --force && \ -echo "Creating header templates..." && \ -autoheader && \ -echo "Creating Makefile templates..." && \ -automake --gnu --add-missing && \ -echo "Creating 'configure'..." && \ -autoconf && \ -echo "" && \ -echo "Run: ./configure; make; make install" && \ -echo "" diff --git a/code/snowballs2/client/Makefile.am b/code/snowballs2/client/Makefile.am deleted file mode 100644 index 028aaefa1..000000000 --- a/code/snowballs2/client/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# -# $Id: Makefile.am,v 1.3 2002-04-10 07:32:46 lecroart Exp $ -# - -SUBDIRS = src data - -EXTRA_DIST = client.cfg.in \ - client.dsp \ - data - -AM_CXXFLAGS = -DSNOWBALLS_CONFIG="\"$pkgsysconfdir\"" - -clientdir = ${pkgsysconfdir} -client_DATA = client.cfg - -# End of Makefile.am - diff --git a/code/snowballs2/client/configure.in b/code/snowballs2/client/configure.in deleted file mode 100644 index d725b29f7..000000000 --- a/code/snowballs2/client/configure.in +++ /dev/null @@ -1,260 +0,0 @@ -dnl -dnl Configuration script for client -dnl -dnl $Id: configure.in,v 1.1 2001-07-11 15:17:40 legros Exp $ -dnl - -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(src/client.cpp) - -MAJOR_VERSION=0 -MINOR_VERSION=2 -PICO_VERSION=0 - -AM_INIT_AUTOMAKE(client, $MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION) - -AM_CONFIG_HEADER(config.h) - - -dnl The following hack should ensure that configure doesn't add optimizing -dnl or debugging flags to CFLAGS or CXXFLAGS -CFLAGS="$CFLAGS " -CXXFLAGS="$CXXFLAGS " - - -dnl ==================================================================== -dnl Checks for programs. - -AC_PROG_MAKE_SET - -AC_PROG_CC -AC_PROG_CXX - -AM_SANITY_CHECK - -AC_PROG_INSTALL - - -dnl ==================================================================== -dnl Configure Settings - -AC_LANG_CPLUSPLUS - - -dnl ==================================================================== -dnl Checks for typedefs, structures, and compiler characteristics. - - -dnl ==================================================================== -dnl Checks for header files. - -AC_STDC_HEADERS -AC_CHECK_HEADERS(fcntl.h unistd.h) - - -dnl ========== -dnl X11 -dnl ========== - -AC_PATH_X - -if test ! "$no_x" = "yes" ; then - if test ! X"$x_libraries" = X ; then - LIBS="$LIBS -L$x_libraries" - fi - if test ! X"$x_includes" = X ; then - CXXFLAGS="$CXXFLAGS -I$x_includes" - fi -else - AC_MSG_ERROR(X11 must be installed.) -fi - - -dnl ========== -dnl STLPort -dnl ========== - -dnl Ask user for path to the STLport header files -AC_ARG_WITH( stlport, - [ --with-stlport= path to the STLPort header files directory. - e.g. /usr/local/include/stlport], - [STLPORT_DIR=$with_stlport - AC_MSG_RESULT(using STLPort header files located in $with_stlport)], - AC_MSG_ERROR([You must call configure with the --with-stlport option. - This tells configure where to find the STLPort header files. - e.g. --with-stlport=/usr/local/include/stlport]) -) - -if test X"$STLPORT_DIR" != X""; -then - CXXFLAGS="-I$STLPORT_DIR $CXXFLAGS" -fi - -dnl Ask user for path to the STLPort library files -AC_ARG_WITH( stllib, - [ --with-stllib= path to the STLPort installation directory. - e.g. /usr/local/lib/stlport], - [STLLIB_DIR=$with_stllib - AC_MSG_RESULT(using STLPort library located in $with_stllib)] -) - -if test X"$STLLIB_DIR" != X""; -then - LIBS="-L$STLLIB_DIR $LIBS" -fi - -LIBS="$LIBS -lstlport_gcc" - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS" - -AC_MSG_CHECKING(for STLPort) -AC_EGREP_CPP( yo_stlport, -[#include -#ifdef __SGI_STL_PORT - yo_stlport -#endif], -[AC_MSG_RESULT(yes)], -AC_MSG_ERROR([STLPort is needed to compile the client (www.stlport.org)]) -) - -CPPFLAGS="$_CPPFLAGS" - - -dnl ========== -dnl NeL -dnl ========== - -dnl Ask user for path to the NeL header files -AC_ARG_WITH( nel, - [ --with-nel= prefix to the NeL files installation. - e.g. /usr/local/include], - [NEL_DIR=$with_nel - AC_MSG_RESULT(using NeL header files located in $with_nel)] -) - -if test X"$NEL_DIR" != X""; -then - CXXFLAGS="-I$NEL_DIR/include $CXXFLAGS" - LIBS="-L$NEL_DIR/lib $LIBS" -fi - -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS" - -AC_MSG_CHECKING(for NeL) -AC_EGREP_CPP( yo_nel, -[#include -#ifdef NL_NET_H - yo_nel -#endif], -[AC_MSG_RESULT(yes)], -AC_MSG_ERROR([NeL is needed to compile the client (www.nevrax.org)]) -) - - -dnl ========== -dnl FreeType 2 -dnl ========== - -dnl Check for the FreeType 2 library files -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) - -if test "$FREETYPE_CONFIG" = "no"; then - AC_MSG_ERROR([Cannot find freetype-config: check your path. - FreeType 2 library is needed to compile the client (www.freetype.org).]) -else - FREETYPE_CFLAGS=`freetype-config --cflags` - FREETYPE_LIBS=`freetype-config --libs` -fi - -dnl CXXFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}" -dnl LIBS="$LIBS ${FREETYPE_LIBS}" -AC_SUBST(FREETYPE_CFLAGS) -AC_SUBST(FREETYPE_LIBS) - -dnl Checking the FreeType 2 instalation -_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}" - -AC_MSG_CHECKING(for FreeType 2 installation) -AC_EGREP_CPP( yo_freetype2, -[#include -#if FREETYPE_MAJOR == 2 - yo_freetype2 -#endif], -[AC_MSG_RESULT(yes)], -AC_MSG_ERROR([Freetype 2 library is needed to compile the client (www.stlport.org).]) -) - -CPPFLAGS="$_CPPFLAGS" - - -dnl ========== -dnl Debug/optimized compilation mode -dnl ========== - -MAX_C_OPTIMIZE="-O6" - -dnl Build optimized or debug version ? -dnl First check for gcc and g++ -if test "$ac_cv_prog_gcc" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" - OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" -else - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="" - OPTIMIZE_CFLAGS="-O" -fi -if test "$ac_cv_prog_cxx_g" = "yes" -then - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="-O" - OPTIMIZE_CXXFLAGS="-O3" -else - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi -AC_ARG_WITH(debug, - [ --with-debug[=full] Build a debug version (huge libraries) - --without-debug Build withoug debugging code (default)], - [with_debug=$withval], - [with_debug=no]) -if test "$with_debug" = "yes" -then - dnl Medium debug. - CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $CXXFLAGS" -elif test "$with_debug" = "full" -then - dnl Full debug. Very slow in some cases - CFLAGS="$DEBUG_CFLAGS $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS" -else - dnl Optimized version. No debug - CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS" - CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS" -fi - - -dnl ==================================================================== -dnl Checks for libraries. - - -dnl ==================================================================== -dnl Checks for library functions. - - -dnl ==================================================================== -dnl Output files to generate. - -AC_OUTPUT( Makefile \ - src/Makefile \ -) - - -dnl End of configure.in diff --git a/code/snowballs2/client/src/Makefile.am b/code/snowballs2/client/src/Makefile.am deleted file mode 100644 index 81fdfaf10..000000000 --- a/code/snowballs2/client/src/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -# -# $Id: Makefile.am,v 1.10 2003-04-07 14:06:08 lecroart Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = snowballs - -snowballs_SOURCES = animation.cpp \ - animation.h \ - camera.cpp \ - camera.h \ - commands.cpp \ - commands.h \ - compass.cpp \ - compass.h \ - configuration.cpp \ - configuration.h \ - entities.cpp \ - entities.h \ - game_time.cpp \ - game_time.h \ - graph.cpp \ - graph.h \ - interface.cpp \ - interface.h \ - internationalization.cpp \ - internationalization.h \ - landscape.cpp \ - landscape.h \ - lens_flare.cpp \ - lens_flare.h \ - mouse_listener.cpp \ - mouse_listener.h \ - network.cpp \ - network.h \ - pacs.cpp \ - pacs.h \ - physics.cpp \ - physics.h \ - radar.cpp \ - radar.h \ - snowballs_client.cpp \ - snowballs_client.h \ - snowballs_config.h \ - sound.cpp \ - sound.h - -snowballs_LDADD = @FREETYPE_LIBS@ @OPENAL_LIBS@ - -AM_CXXFLAGS = -DSNOWBALLS_CONFIG="\"${pkgsysconfdir}/\"" @FREETYPE_CFLAGS@ - - -# End of Makefile.am - diff --git a/code/snowballs2/configure.ac b/code/snowballs2/configure.ac deleted file mode 100644 index 7ca02a78b..000000000 --- a/code/snowballs2/configure.ac +++ /dev/null @@ -1,264 +0,0 @@ -dnl ==================================================================== -dnl Configuration script for Snowballs 2 -dnl ==================================================================== - - -dnl ==================================================================== -dnl Process this file with autoconf to produce a configure script. -dnl ==================================================================== - -# If you want to change the version, must must change AC_INIT -# *and* AC_SUBST(LIBTOOL_VERSION) - -AC_PREREQ(2.57) -AC_INIT([snowballs],[0.3.0],[nel-all@nevrax.org]) -AM_INIT_AUTOMAKE([tar-ustar]) - -AM_CONFIG_HEADER(config.h) - -AC_SUBST(LIBTOOL_VERSION, [0:3:0]) - -dnl ==================================================================== -dnl Checks for programs. -dnl ==================================================================== -AC_CANONICAL_HOST -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_LIBTOOL -AM_PROG_LIBTOOL -AM_SANITY_CHECK - -AC_SYS_LARGEFILE - -AM_MAINTAINER_MODE - -dnl The following hack should ensure that configure doesn't add optimizing -dnl or debugging flags to CFLAGS or CXXFLAGS -CXXFLAGS="$CXXFLAGS -ftemplate-depth-24" - -AC_CHECK_LIB([pthread], [pthread_create]) -AC_CHECK_LIB([dl], [dlopen]) -AC_CHECK_LIB([rt], [clock_gettime]) - -dnl ==================================================================== -dnl Checks Snowballs modules (Client / Server) to install / Disable -dnl ==================================================================== - -SNO_SUBDIRS="" - -dnl Client -AC_ARG_ENABLE( client, - [ --disable-client disable compilation and install of Snowballs Client.], - [ AC_MSG_RESULT(disable Snowballs Client.) ], - [ SNO_SUBDIRS="$SNO_SUBDIRS client" - enable_client="yes" ] ) - -dnl Server -AC_ARG_ENABLE( server, - [ --disable-server disable compilation and install of Snowballs Server.], - [ AC_MSG_RESULT(disable Snowballs Server.) ], - [ SNO_SUBDIRS="$SNO_SUBDIRS server" - enable_server="yes" ] ) - -AC_SUBST(SNO_SUBDIRS) - - -dnl ==================================================================== -dnl Configure Settings -dnl ==================================================================== - -dnl Set the C++ compiler as the default compiler for the configure script -dnl compilation tests -AC_LANG_CPLUSPLUS - - -dnl ==================================================================== -dnl Debug/optimized compilation mode -dnl ==================================================================== - -AM_NEL_DEBUG - - -dnl ==================================================================== -dnl Checks for typedefs, structures, and compiler characteristics. -dnl ==================================================================== - -# Test endianness -AC_C_BIGENDIAN - -# Supress GCC "multi-character character constant" warnings. -if test "X$CC" = "Xgcc"; -then - if test "$with_debug" = "yes" - then - # - # When debugging variables are declared for the sole purpose of - # inspecting their content with a debugger. They are not used - # in the code itself and this is legitimate, hence the -Wno-unused - # - CXXFLAGS="$CXXFLAGS -Wno-unused" - fi -fi - -# Add some common define -if test "$ac_cv_cxx_compiler_gnu" = "yes"; -then - CXXFLAGS="$CXXFLAGS -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused" -fi - - -dnl ==================================================================== -dnl Checks for header and lib files. -dnl ==================================================================== - -AC_FUNC_ALLOCA -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_HEADER_TIME -AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h sys/time.h]) -AC_CHECK_LIB([pthread], [pthread_create]) -AC_CHECK_LIB([dl], [dlopen]) - -dnl ==================================================================== -dnl Checks for typedefs, structures, and compiler characteristics. -dnl ==================================================================== - -AC_HEADER_STDBOOL -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T -AC_HEADER_TIME -AC_STRUCT_TM -AC_C_VOLATILE -AC_CHECK_TYPES([ptrdiff_t]) -AC_CHECK_TYPES([size_t]) -AC_CHECK_TYPES([uintptr_t]) - -dnl ==================================================================== -dnl X11 - -AC_PATH_X - -if test ! "$no_x" = "yes" ; then - if test ! X"$x_libraries" = X - then - LIBS="$LIBS -L$x_libraries" - fi - if test ! X"$x_includes" = X - then - CXXFLAGS="$CXXFLAGS -I$x_includes" - fi -else - if test "$enable_client" = "yes" - then - AC_MSG_ERROR(X11 must be installed.) - fi -fi - - -dnl ==================================================================== -dnl Checks for libraries. -dnl ==================================================================== - -dnl ==================================================================== -dnl OpenAL - -AM_PATH_OPENAL($enable_client) - - -dnl ==================================================================== -dnl LibXML - -dnl Use C compiler as a default for the libxml tests. -AC_LANG([C]) - -AM_PATH_XML2([2.0.0], [], [AC_MSG_ERROR([libxml2 must be installed])]) - -CXXFLAGS="$CXXFLAGS $XML_CFLAGS $XML_CPPFLAGS" - -LIBS="$LIBS $XML_LIBS" - -dnl ==================================================================== -dnl NeL - -dnl misc net 3d pacs sound ai georges -AM_PATH_NEL("yes", "yes", $enable_client, $enable_client, "no", "no", "no") - -dnl ==================================================================== -dnl FreeType 2 - -AM_PATH_FREETYPE($enable_client) - -dnl ==================================================================== -dnl Checks for library functions. -dnl ==================================================================== - -dnl ==================================================================== -dnl Snowballs data, configuration and logs file location -dnl ==================================================================== - -test "x$prefix" = xNONE && prefix=$ac_default_prefix - -AC_ARG_WITH(database, - [ --with-database[=DIR] - use DIR instead of the default prefix/share//games/snowballs], - [database=$withval], - [database="${prefix}/share/games/snowballs"]) -AC_SUBST(database) - -SNOWBALLS_DATABASE='$database' -AC_SUBST([SNOWBALLS_DATABASE]) - -AC_ARG_WITH(sysconfdir, - [ --with-sysconfdir[=DIR] - use DIR instead of the default sysconfdir/snowballs], - [pkgsysconfdir=$withval], - [pkgsysconfdir='${sysconfdir}/snowballs']) -AC_SUBST(pkgsysconfdir) - -SNOWBALLS_CONFIG='$pkgsysconfdir' -AC_SUBST([SNOWBALLS_CONFIG]) - -AC_ARG_WITH(logdir, - [ --with-logdir[=DIR] - use DIR instead of the default localstatedir/log/snowballs], - [logdir=$withval], - [logdir='${localstatedir}/log/snowballs']) -AC_SUBST(logdir) - -SNOWBALLS_LOGS='$logdir' -#AH_TEMPLATE([SNOWBALLS_LOGS], [The path to where Snowballs logs should be stored.]) -#AC_DEFINE_UNQUOTED([SNOWBALLS_LOGS], "$log_dir") -AC_SUBST([SNOWBALLS_LOGS]) - -dnl ==================================================================== -dnl Output files to generate. -dnl ==================================================================== - -AC_CONFIG_FILES([Makefile \ - client/Makefile \ - client/client.cfg \ - client/src/Makefile \ - client/data/Makefile \ - client/data/anims/Makefile \ - client/data/maps/Makefile \ - client/data/maps/texture_croisi/Makefile \ - client/data/pacs/Makefile \ - client/data/shapes/Makefile \ - client/data/tiles/Makefile \ - client/data/zones/Makefile \ - server/Makefile \ - server/frontend/Makefile \ - server/frontend/src/Makefile \ - server/chat/Makefile \ - server/chat/src/Makefile \ - server/position/Makefile \ - server/position/src/Makefile \ -]) -AC_OUTPUT - -dnl End of configure.in - diff --git a/code/snowballs2/server/Makefile.am b/code/snowballs2/server/Makefile.am deleted file mode 100644 index fbfdffccb..000000000 --- a/code/snowballs2/server/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# -# $Id: Makefile.am,v 1.3 2001-07-23 13:30:41 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = frontend chat position - - -# End of Makefile.am - diff --git a/code/snowballs2/server/chat/Makefile.am b/code/snowballs2/server/chat/Makefile.am deleted file mode 100644 index c69f53af6..000000000 --- a/code/snowballs2/server/chat/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# -# $Id: Makefile.am,v 1.3 2002-04-10 07:32:46 lecroart Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = src - -EXTRA_DIST = chat_service.cfg chat_8.vcproj chat.dsp chat.vcproj - -sno_chatdir = ${pkgsysconfdir} -sno_chat_DATA = chat_service.cfg - -# End of Makefile.am - diff --git a/code/snowballs2/server/chat/src/Makefile.am b/code/snowballs2/server/chat/src/Makefile.am deleted file mode 100644 index 08616097a..000000000 --- a/code/snowballs2/server/chat/src/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# -# $Id: Makefile.am,v 1.7 2002-03-19 17:42:49 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -sbin_PROGRAMS = sno_chat - -sno_chat_SOURCES = main.cpp - -AM_CXXFLAGS = -DSNOWBALLS_CONFIG="\"${pkgsysconfdir}\"" -DSNOWBALLS_LOGS="\"${logdir}\"" - -# End of Makefile.am - diff --git a/code/snowballs2/server/frontend/Makefile.am b/code/snowballs2/server/frontend/Makefile.am deleted file mode 100644 index 1abddddfd..000000000 --- a/code/snowballs2/server/frontend/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# -# $Id: Makefile.am,v 1.3 2002-04-10 07:32:46 lecroart Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = src - -EXTRA_DIST = frontend_service.cfg frontend_8.vcproj frontend.dsp frontend.vcproj - -sno_frontenddir = ${pkgsysconfdir} -sno_frontend_DATA = frontend_service.cfg - -# End of Makefile.am - diff --git a/code/snowballs2/server/frontend/src/Makefile.am b/code/snowballs2/server/frontend/src/Makefile.am deleted file mode 100644 index 249a25c06..000000000 --- a/code/snowballs2/server/frontend/src/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# -# $Id: Makefile.am,v 1.7 2002-03-19 17:42:49 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -sbin_PROGRAMS = sno_frontend - -sno_frontend_SOURCES = main.cpp - -AM_CXXFLAGS = -DSNOWBALLS_CONFIG="\"${pkgsysconfdir}\"" -DSNOWBALLS_LOGS="\"${logdir}\"" -# End of Makefile.am - diff --git a/code/snowballs2/server/position/Makefile.am b/code/snowballs2/server/position/Makefile.am deleted file mode 100644 index cc183c787..000000000 --- a/code/snowballs2/server/position/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# -# $Id: Makefile.am,v 1.3 2002-04-10 07:32:46 lecroart Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = src - -EXTRA_DIST = position_service.cfg position_8.vcproj position.dsp position.vcproj - -sno_posdir = ${pkgsysconfdir} -sno_pos_DATA = position_service.cfg - -# End of Makefile.am - diff --git a/code/snowballs2/server/position/src/Makefile.am b/code/snowballs2/server/position/src/Makefile.am deleted file mode 100644 index b34ee14ba..000000000 --- a/code/snowballs2/server/position/src/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -# -# $Id: Makefile.am,v 1.7 2002-03-19 17:42:49 valignat Exp $ -# - -MAINTAINERCLEANFILES = Makefile.in - -sbin_PROGRAMS = sno_position - -sno_position_SOURCES = main.cpp \ - physics.h \ - physics.cpp - -AM_CXXFLAGS = -DSNOWBALLS_CONFIG="\"${pkgsysconfdir}\"" -DSNOWBALLS_LOGS="\"${logdir}\"" - -# End of Makefile.am - From 71b7cb9ef0cb54f303fd5b58d27dae2862b2da89 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 4 Mar 2012 14:01:11 +0100 Subject: [PATCH 04/20] Changed: #1433 Merge changes from patch 1.13 --- code/ryzom/server/src/ai_service/ai.cpp | 9 + code/ryzom/server/src/ai_service/ai.h | 6 + code/ryzom/server/src/ai_service/ai_bot.cpp | 8 +- code/ryzom/server/src/ai_service/ai_bot.h | 8 +- .../server/src/ai_service/ai_bot_npc.cpp | 9 +- .../server/src/ai_service/ai_bot_pet.cpp | 26 + code/ryzom/server/src/ai_service/ai_bot_pet.h | 2 + .../server/src/ai_service/ai_instance.cpp | 11 +- .../ryzom/server/src/ai_service/ai_instance.h | 2 +- .../server/src/ai_service/ai_mgr_pet.cpp | 7 +- .../server/src/ai_service/ai_outpost.cpp | 14 +- .../server/src/ai_service/ai_profile_npc.cpp | 133 +- .../server/src/ai_service/ai_profile_npc.h | 47 + code/ryzom/server/src/ai_service/commands.cpp | 2 +- .../src/ai_service/generic_logic_action.cpp | 5 +- code/ryzom/server/src/ai_service/messages.cpp | 7 +- code/ryzom/server/src/ai_service/nf_grp.cpp | 169 +- .../server/src/ai_service/nf_grp_npc.cpp | 163 +- .../ryzom/server/src/ai_service/nf_static.cpp | 32 +- .../src/ai_service/npc_description_msg.cpp | 8 + .../src/ai_service/npc_description_msg.h | 7 +- .../server/src/ai_service/script_compiler.cpp | 38 +- .../script_compiler_native_func.cpp | 2 + .../visual_properties_interface.cpp | 6 +- .../ai_service/visual_properties_interface.h | 2 +- .../src/entities_game_service/admin.cpp | 1690 +++++++++++++++-- .../server/src/entities_game_service/admin.h | 2 + .../building_manager/building_manager.cpp | 15 +- .../building_manager/building_manager.h | 8 +- .../building_physical_inline.h | 1 - .../entities_game_service/client_messages.cpp | 126 +- .../creature_manager/creature.cpp | 3 + .../creature_manager/creature.h | 3 + .../creature_manager/creature_manager.cpp | 66 + .../creature_manager/creature_manager.h | 19 + .../entities_game_service/database_plr.cpp | 5 +- .../src/entities_game_service/database_plr.h | 21 +- .../entities_game_service/dyn_chat_egs.cpp | 17 + .../src/entities_game_service/dyn_chat_egs.h | 4 + .../entities_game_service.cpp | 2 + .../entity_manager/entity_callbacks.cpp | 63 +- .../entity_manager/entity_callbacks.h | 9 + .../game_item_manager/game_item.cpp | 11 + .../game_item_manager/game_item.h | 17 +- .../game_item_manager/player_inv_xchg.cpp | 4 + .../game_item_manager/player_inventory.cpp | 8 +- .../guild_manager/guild.cpp | 47 +- .../guild_manager/guild_leader_module.cpp | 2 +- .../mission_client_callbacks.cpp | 7 +- .../mission_manager/mission_action.cpp | 1 - .../mission_manager/mission_step_kill.cpp | 3 +- .../mission_manager/mission_step_talk.cpp | 140 +- .../mission_manager/mission_step_template.cpp | 4 + .../mission_manager/mission_step_template.h | 5 +- .../mission_manager/mission_template.cpp | 9 - .../modules/shard_unifier_client.cpp | 12 + .../outpost_manager/outpost.cpp | 69 +- .../player_manager/character.cpp | 536 +++++- .../player_manager/character.h | 110 +- .../player_manager/player_manager.cpp | 2 +- .../progression/progression_pvp.cpp | 120 +- .../progression/progression_pvp.h | 16 +- .../pvp_manager/pvp_faction.cpp | 122 +- .../pvp_manager/pvp_manager_2.cpp | 142 +- .../pvp_manager/pvp_manager_2.h | 8 +- .../pvp_manager/pvp_zone.cpp | 112 +- .../shop_type/item_for_sale.cpp | 6 + .../shop_type/item_for_sale.h | 3 +- .../team_manager/team.cpp | 416 ++-- .../entities_game_service/team_manager/team.h | 57 +- .../team_manager/team_manager.cpp | 245 ++- .../team_manager/team_manager.h | 19 +- .../src/input_output_service/chat_manager.h | 4 +- .../input_output_service.cpp | 6 +- .../src/input_output_service/messages.cpp | 13 +- .../input_output_service/parameter_traits.cpp | 6 +- .../input_output_service/string_manager.cpp | 24 + .../src/input_output_service/string_manager.h | 1 + .../string_manager_parser.cpp | 4 +- .../src/server_share/entity_locator_itf.h | 36 +- .../src/server_share/entity_locator_itf.xml | 3 +- .../server/src/server_share/msg_ai_service.h | 41 + .../server_share/npc_description_messages.h | 5 +- .../src/server_share/pet_interface_msg.h | 2 + .../server/src/server_share/pvp_relation.h | 8 +- .../shard_unifier_service/entity_locator.cpp | 7 +- 86 files changed, 4372 insertions(+), 818 deletions(-) diff --git a/code/ryzom/server/src/ai_service/ai.cpp b/code/ryzom/server/src/ai_service/ai.cpp index b51f1279c..ed8926f5b 100644 --- a/code/ryzom/server/src/ai_service/ai.cpp +++ b/code/ryzom/server/src/ai_service/ai.cpp @@ -423,6 +423,15 @@ void CAIS::update() _CreatureChangeHPList.Entities.clear(); _CreatureChangeHPList.DeltaHp.clear(); } + if (!_CreatureChangeMaxHPList.Entities.empty()) + { + nlassert(_CreatureChangeMaxHPList.Entities.size()==_CreatureChangeMaxHPList.MaxHp.size()); + nlassert(_CreatureChangeMaxHPList.Entities.size()==_CreatureChangeMaxHPList.SetFull.size()); + _CreatureChangeMaxHPList.send("EGS"); + _CreatureChangeMaxHPList.Entities.clear(); + _CreatureChangeMaxHPList.MaxHp.clear(); + _CreatureChangeMaxHPList.SetFull.clear(); + } } // diff --git a/code/ryzom/server/src/ai_service/ai.h b/code/ryzom/server/src/ai_service/ai.h index f06271c17..aed47f262 100644 --- a/code/ryzom/server/src/ai_service/ai.h +++ b/code/ryzom/server/src/ai_service/ai.h @@ -221,6 +221,11 @@ public: { return _CreatureChangeHPList; } + + CChangeCreatureMaxHPMsg &getCreatureChangeMaxHP() + { + return _CreatureChangeMaxHPList; + } enum TSearchType { @@ -288,6 +293,7 @@ private: // Faunas descriptions to be sent each frame CFaunaBotDescription _FaunaDescriptionList; CChangeCreatureHPMsg _CreatureChangeHPList; + CChangeCreatureMaxHPMsg _CreatureChangeMaxHPList; /// The emot identifiers std::map _EmotNames; diff --git a/code/ryzom/server/src/ai_service/ai_bot.cpp b/code/ryzom/server/src/ai_service/ai_bot.cpp index 31ce2fce0..03e2a68db 100644 --- a/code/ryzom/server/src/ai_service/ai_bot.cpp +++ b/code/ryzom/server/src/ai_service/ai_bot.cpp @@ -61,7 +61,7 @@ CAIInstance* CSpawnBot::getAIInstance() const void CSpawnBot::setVisualPropertiesName() { CBot& botRef = CSpawnBot::getPersistent(); - std::string name = botRef.getName(); + ucstring name = botRef.getName(); if (CVisualPropertiesInterface::UseIdForName) { @@ -85,7 +85,7 @@ void CSpawnBot::setVisualPropertiesName() if (! botRef.getFaunaBotUseBotName()) //false by default { if (botRef.getSheet()->ForceDisplayCreatureName()) - return; + return; // the npc name is displayed as a fauna } @@ -403,8 +403,8 @@ std::vector CBot::getMultiLineInfoString() const pushTitle(container, "CBot"); pushEntry(container, "id=" + getIndexString()); container.back() += " eid=" + getEntityIdString(); - container.back() += " alias=" + getAliasTreeOwner()->getAliasString(); - container.back() += " name=" + getName(); + container.back() += " alias=" + getAliasTreeOwner()->getAliasString() + " raw alias=" + NLMISC::toString(getAliasTreeOwner()->getAlias()); + pushEntry(container, " name=" + getName()); if (isSheetValid()) container.back() += " sheet=" + NLMISC::CFile::getFilenameWithoutExtension(getSheet()->SheetId().toString()); pushEntry(container, "fullname=" + getFullName()); diff --git a/code/ryzom/server/src/ai_service/ai_bot.h b/code/ryzom/server/src/ai_service/ai_bot.h index d74442b83..3156edb82 100644 --- a/code/ryzom/server/src/ai_service/ai_bot.h +++ b/code/ryzom/server/src/ai_service/ai_bot.h @@ -95,7 +95,7 @@ public: virtual float getAggroPropagationRadius() const; //@} - void setVisualPropertiesName(); + virtual void setVisualPropertiesName(); // as there not a lot of prop (1 or 2, maybe 3) stores in this comportment, we don't need hash. bool getProp(size_t Id, uint32& value) const; @@ -241,8 +241,8 @@ public: NLMISC::CEntityId createEntityId() const; - const std::string& getCustomName() const { return _CustomName; } - void setCustomName(const std::string &name) { _CustomName = name; } + const ucstring& getCustomName() const { return _CustomName; } + void setCustomName(const ucstring &name) { _CustomName = name; } virtual void setClientSheet(const std::string & clientSheetName); @@ -272,7 +272,7 @@ private: bool _IgnoreOffensiveActions; bool _Healer; bool _BuildingBot; - std::string _CustomName; + ucstring _CustomName; CTimer _SetSheetTimer; struct CSetSheetData { diff --git a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp index f56a745db..a8175cc9a 100644 --- a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp +++ b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp @@ -274,9 +274,12 @@ std::vector CSpawnBotNpc::getMultiLineInfoString() const else { vector const& missions = _CurrentChatProfile.getMissions(); - pushEntry(container, "missions: " + NLMISC::toString("%u", missions[0])); - for (size_t i=1; ifindMissionName(missions[i]); + pushEntry(container, NLMISC::toString(" %u (%s)", missions[i], name.c_str())); + } } pushFooter(container); diff --git a/code/ryzom/server/src/ai_service/ai_bot_pet.cpp b/code/ryzom/server/src/ai_service/ai_bot_pet.cpp index e6177fda1..6e0747933 100644 --- a/code/ryzom/server/src/ai_service/ai_bot_pet.cpp +++ b/code/ryzom/server/src/ai_service/ai_bot_pet.cpp @@ -16,6 +16,7 @@ #include "stdpch.h" #include "ai_bot_pet.h" +#include "visual_properties_interface.h" #include "nel/misc/random.h" #include "ai_grp_pet.h" @@ -92,3 +93,28 @@ CSpawnGroupPet& CSpawnBotPet::spawnGrp() { return static_cast(CSpawnBot::spawnGrp()); } + +void CSpawnBotPet::setVisualPropertiesName() +{ + CBotPet& botRef = CSpawnBotPet::getPersistent(); + ucstring name = botRef.getName(); + + if (CVisualPropertiesInterface::UseIdForName) + { + name = NLMISC::toString("AI:%s", botRef.getIndexString().c_str()); + } + + if (name.empty() && CVisualPropertiesInterface::ForceNames) + { + name = NLMISC::CFile::getFilenameWithoutExtension(botRef.getSheet()->SheetId().toString().c_str()); + } + + if (!botRef.getCustomName().empty()) + name = botRef.getCustomName(); + + // no name the bot will appear without name on the client. + if (name.empty()) + return; + + CVisualPropertiesInterface::setName(dataSetRow(), name); +} diff --git a/code/ryzom/server/src/ai_service/ai_bot_pet.h b/code/ryzom/server/src/ai_service/ai_bot_pet.h index 34eacd039..67a448ee0 100644 --- a/code/ryzom/server/src/ai_service/ai_bot_pet.h +++ b/code/ryzom/server/src/ai_service/ai_bot_pet.h @@ -65,6 +65,8 @@ public: CPathPosition& pathPos() { return _PathPos; } uint32 _DeathTime; + + void setVisualPropertiesName(); private: diff --git a/code/ryzom/server/src/ai_service/ai_instance.cpp b/code/ryzom/server/src/ai_service/ai_instance.cpp index 5fd8e878a..240af6da3 100644 --- a/code/ryzom/server/src/ai_service/ai_instance.cpp +++ b/code/ryzom/server/src/ai_service/ai_instance.cpp @@ -653,7 +653,7 @@ static float randomAngle() return val; } -CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName) +CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName, const std::string &look) { if (!_EventNpcManager) return NULL; @@ -689,10 +689,13 @@ CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& CBotNpc* const bot = NLMISC::safe_cast(grp->bots()[i]); bot->setSheet(sheet); + if (!look.empty()) + bot->setClientSheet(look); bot->equipmentInit(); bot->initEnergy(/*groupEnergyCoef()*/0); CAIVector rpos(pos); - if (i!=0) + // Spawn all randomly except if only 1 bot + if (nbBots > 1) { RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap(); RYAI_MAP_CRUNCH::CWorldPosition wp; @@ -857,6 +860,7 @@ void cbEventCreateNpcGroup( NLNET::CMessage& msgin, const std::string &serviceNa double dispersionRadius; bool spawnBots; std::string botsName; + std::string look; msgin.serial(messageVersion); nlassert(messageVersion==1); msgin.serial(instanceNumber); @@ -869,10 +873,11 @@ void cbEventCreateNpcGroup( NLNET::CMessage& msgin, const std::string &serviceNa msgin.serial(dispersionRadius); msgin.serial(spawnBots); msgin.serial(botsName); + msgin.serial(look); CAIInstance* instance = CAIS::instance().getAIInstance(instanceNumber); if (instance) { - CGroupNpc* npcGroup = instance->eventCreateNpcGroup(nbBots, sheetId, CAIVector((double)x/1000., (double)y/1000.), dispersionRadius, spawnBots, (double)orientation/1000., botsName); + CGroupNpc* npcGroup = instance->eventCreateNpcGroup(nbBots, sheetId, CAIVector((double)x/1000., (double)y/1000.), dispersionRadius, spawnBots, (double)orientation/1000., botsName, look); if (npcGroup != NULL) { _PlayersLastCreatedNpcGroup[playerId] = npcGroup->getName(); diff --git a/code/ryzom/server/src/ai_service/ai_instance.h b/code/ryzom/server/src/ai_service/ai_instance.h index ce53d0559..6540620d9 100644 --- a/code/ryzom/server/src/ai_service/ai_instance.h +++ b/code/ryzom/server/src/ai_service/ai_instance.h @@ -207,7 +207,7 @@ public: return NULL; } - CGroupNpc* eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName); + CGroupNpc* eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName, const std::string &look); /// create a new easter egg CBotEasterEgg* createEasterEgg(uint32 easterEggId, NLMISC::CSheetId const& sheetId, std::string const& botName, double x, double y, double z, double heading, const std::string& look); diff --git a/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp b/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp index e72a88abc..31e01d143 100644 --- a/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp +++ b/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp @@ -290,6 +290,11 @@ void CPetSpawnMsgImp::callback(std::string const& name, NLNET::TServiceId id) } botPet->setSheet(sheet); + + if (!CustomName.empty()) + { + botPet->setCustomName(CustomName); + } if (!botPet->spawn()) { @@ -314,7 +319,7 @@ void CPetSpawnMsgImp::callback(std::string const& name, NLNET::TServiceId id) #endif return; } - + botPet->getSpawn()->setAIProfile(new CAIPetProfileStand(botPet->getSpawn())); confirmMsg.PetMirrorRow = botPet->getSpawn()->dataSetRow(); diff --git a/code/ryzom/server/src/ai_service/ai_outpost.cpp b/code/ryzom/server/src/ai_service/ai_outpost.cpp index 0ef71b2ee..ed2c62b77 100644 --- a/code/ryzom/server/src/ai_service/ai_outpost.cpp +++ b/code/ryzom/server/src/ai_service/ai_outpost.cpp @@ -873,14 +873,20 @@ void COutpost::createSquad(CGroupDesc const* groupDesc, COu // Attack only the declared ennemies of the outpost if (side==OUTPOSTENUMS::OutpostOwner) { - // grp->faction ().addProperty(NLMISC::toString("outpost:%s:defender", getAliasString().c_str())); - // grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:defender", getAliasString().c_str())); + // Bots factions + grp->faction ().addProperty(NLMISC::toString("outpost:%s:bot_defender", getAliasString().c_str())); + grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:bot_defender", getAliasString().c_str())); + grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:bot_attacker", getAliasString().c_str())); + // Players faction grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:attacker", getAliasString().c_str())); } if (side==OUTPOSTENUMS::OutpostAttacker) { - // grp->faction ().addProperty(NLMISC::toString("outpost:%s:attacker", getAliasString().c_str())); - // grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:attacker", getAliasString().c_str())); + // Bots factions + grp->faction ().addProperty(NLMISC::toString("outpost:%s:bot_attacker", getAliasString().c_str())); + grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:bot_attacker", getAliasString().c_str())); + grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:bot_defender", getAliasString().c_str())); + // Players faction grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:defender", getAliasString().c_str())); } grp->_AggroRange = 25; diff --git a/code/ryzom/server/src/ai_service/ai_profile_npc.cpp b/code/ryzom/server/src/ai_service/ai_profile_npc.cpp index a97beb24f..e47003cb6 100644 --- a/code/ryzom/server/src/ai_service/ai_profile_npc.cpp +++ b/code/ryzom/server/src/ai_service/ai_profile_npc.cpp @@ -1562,7 +1562,7 @@ void CGrpProfileGoToPoint::updateProfile(uint ticksSinceLastUpdate) dx+=dir.x; dy+=dir.y; - // 4 rangées. + // 4 rows CAIVector idealPos=groupPosition; if (botIndex>=_NbBotInNormalShape) { @@ -2054,7 +2054,7 @@ void CGrpProfileFollowRoute::updateProfile(uint ticksSinceLastUpdate) dx+=dir.x; dy+=dir.y; - // 4 rangées. + // 4 rows CAIVector idealPos=groupPosition; if (botIndex>=_NbBotInNormalShape) { @@ -2299,6 +2299,94 @@ void CGrpProfileStandOnVertices::updateProfile(uint ticksSinceLastUpdate) } } +////////////////////////////////////////////////////////////////////////////// +// CGrpProfileFollowPlayer // +////////////////////////////////////////////////////////////////////////////// +CGrpProfileFollowPlayer::CGrpProfileFollowPlayer(CProfileOwner* owner, TDataSetRow const& playerRow, uint32 dispersionRadius) +: CMoveProfile(owner) +, _PlayerRow(playerRow) +, _DispersionRadius(dispersionRadius) +, _PathPos(CAngle(0)) +, _PathCont(NLMISC::safe_cast(owner)->getAStarFlag()) +{ + PROFILE_LOG("group", "follow player", "ctor", ""); + _Status = CFollowPath::FOLLOWING; +} + +bool CGrpProfileFollowPlayer::destinationReach() const +{ + return _Status == CFollowPath::FOLLOW_ARRIVED + || _Status==CFollowPath::FOLLOW_NO_PATH; +} + +void CGrpProfileFollowPlayer::beginProfile() +{ + _Status = CFollowPath::FOLLOWING; +} + +// TODO: this doesn't work very well at all... +void CGrpProfileFollowPlayer::updateProfile(uint ticksSinceLastUpdate) +{ + H_AUTO(CGrpProfileFollowPlayerUpdate); + CFollowPathContext fpcGrpFollowPlayerUpdate("CGrpProfileFollowPlayerUpdate"); + + // check all bot to see if there need to move + CSpawnGroupNpc* grp = static_cast(static_cast(_Grp)); + CGroupNpc &pgrp = grp->getPersistent(); + + CBotPlayer* plrPtr = dynamic_cast(CAIS::instance().getEntityPhysical(_PlayerRow)); + + if ( ! plrPtr) { + nlwarning("CGrpProfileFollowPlayer: No valid player position to follow"); + return; + } + + _PathCont.setDestination(plrPtr->wpos()); + _PathPos._Angle = plrPtr->theta(); + + for (uint i = 0; i < pgrp.bots().size(); ++i) + { + CBotNpc* bot = static_cast(pgrp.bots()[i]); + if (!bot) + continue; + + // check current bot state + CSpawnBotNpc *sbot = bot->getSpawn(); + if (!sbot) + continue; + + // Need to wait for a correct position before moving? + CAIVector const& dest = _PathCont.getDestination(); + if (dest.x()==0 || dest.y()==0) + return; + + static const std::string runParameter("running"); + float dist; + if (sbot->getPersistent().getOwner()->getSpawnObj()->checkProfileParameter(runParameter)) + dist = sbot->runSpeed()*ticksSinceLastUpdate; + else + dist = sbot->walkSpeed()*ticksSinceLastUpdate; + + // Move + CFollowPath::TFollowStatus const status = CFollowPath::getInstance()->followPath( + sbot, + _PathPos, + _PathCont, + dist, + 0.f, + 0.5f); + + if (status==CFollowPath::FOLLOW_NO_PATH) + { + nlwarning("Problem with following player"); + } + + + } +} + + + ////////////////////////////////////////////////////////////////////////////// // CGrpProfileIdle // ////////////////////////////////////////////////////////////////////////////// @@ -3687,10 +3775,14 @@ bool CGrpProfileFaction::entityHavePartOfFactions(CAIEntityPhysical const* entit std::set::const_iterator it, end = factionsSet.end(); for (it=factionsSet.begin(); it!=end; ++it) { - std::string fameFaction = scriptFactionToFameFaction(CStringMapper::unmap(*it)); + string factionInfos = CStringMapper::unmap(*it); + string fameFaction = scriptFactionToFameFaction(factionInfos); // sint32 fame = CFameInterface::getInstance().getFameOrCivilisationFame(entity->getEntityId(), CStringMapper::map(fameFaction)); sint32 const fame = entity->getFame(fameFaction); - if (fame!=NO_FAME && fame>0) + sint32 const value = scriptFactionToFameFactionValue(factionInfos); + bool gt = scriptFactionToFameFactionGreaterThan(factionInfos); + if ((fame != NO_FAME && gt && fame > value) || + (fame != NO_FAME && !gt && fame < value)) { // nldebug("Entity has faction %s", CStringMapper::unmap(*it).c_str()); return true; @@ -3731,12 +3823,41 @@ std::string CGrpProfileFaction::scriptFactionToFameFaction(std::string name) ret += "_"; ret += name[i]-'A'+'a'; } + else if (name[i] == '>' || name[i] == '<') + { + return ret; + } else + { ret += name[i]; + } } return ret; } +bool CGrpProfileFaction::scriptFactionToFameFactionGreaterThan(string name) +{ + if (name.find("<") != string::npos) + return false; + + return true; +} + +sint32 CGrpProfileFaction::scriptFactionToFameFactionValue(string name) +{ + size_t start = name.find(">"); + if (start == string::npos) + { + start = name.find("<"); + if (start == string::npos) + return 0; + } + + sint32 value; + NLMISC::fromString(name.substr(start+1), value); + return value*6000; +} + std::string CGrpProfileFaction::fameFactionToScriptFaction(std::string name) { std::string ret = "Famous"; @@ -3772,9 +3893,9 @@ void CGrpProfileFaction::checkTargetsAround() CPropertySetWithExtraList const& thisEnnemyFactions = thisGrpNpc.ennemyFaction(); // We don't assist or attack players if our friends/ennemies are not in factions - bool const assistPlayers = thisFriendFactions.containsPartOfStrict(_FameFactions); + bool const assistPlayers = (thisFriendFactions.containsPartOfStrictFilter("Famous*") || thisFriendFactions.have(AITYPES::CPropertyId("Player"))); bool const assistBots = !thisFriendFactions.empty() && !bNoAssist; - bool const attackPlayers = (!thisEnnemyFactions.extraSetEmpty()) || thisEnnemyFactions.containsPartOfStrict(_FameFactions) || thisEnnemyFactions.containsPartOfStrictFilter("outpost:*"); + bool const attackPlayers = (!thisEnnemyFactions.extraSetEmpty()) || thisEnnemyFactions.containsPartOfStrictFilter("Famous*") || thisEnnemyFactions.have(AITYPES::CPropertyId("Player")) || thisEnnemyFactions.containsPartOfStrictFilter("outpost:*"); bool const attackBots = !thisEnnemyFactions.empty(); CAIVision Vision; diff --git a/code/ryzom/server/src/ai_service/ai_profile_npc.h b/code/ryzom/server/src/ai_service/ai_profile_npc.h index e46f1b4be..9fed6e662 100644 --- a/code/ryzom/server/src/ai_service/ai_profile_npc.h +++ b/code/ryzom/server/src/ai_service/ai_profile_npc.h @@ -628,6 +628,49 @@ private: CAITimer _Timer; }; +class CGrpProfileFollowPlayer : +public CMoveProfile +{ +public: + CGrpProfileFollowPlayer(CProfileOwner* owner, TDataSetRow const& playerRow, uint32 dispersionRadius); + virtual ~CGrpProfileFollowPlayer() {}; + + void setBotStandProfile(AITYPES::TProfiles botStandProfileType, IAIProfileFactory* botStandProfileFactory); + + /// @name IAIProfile implementation + //@{ + virtual void beginProfile(); + virtual void updateProfile(uint ticksSinceLastUpdate); + virtual void endProfile() {}; + virtual AITYPES::TProfiles getAIProfileType() const { return AITYPES::BOT_FOLLOW_POS; } + virtual std::string getOneLineInfoString() const { return std::string("follow_player group profile"); } + //@} + + void stateChangeProfile() {}; + bool destinationReach() const; + + void addBot (CBot* bot) {}; + void removeBot (CBot* bot) {}; + CPathCont* getPathCont (CBot const* bot) { return NULL; }; + + +protected: +private: + /// the profile type to apply to bot standing between two deplacement + AITYPES::TProfiles _BotStandProfileType; + /// the profile factory to apply to bot standing between two deplacement + IAIProfileFactory*_BotStandProfileFactory; + + CFollowPath::TFollowStatus _Status; + CPathPosition _PathPos; + CPathCont _PathCont; + CAIVector _LastPos; + + TDataSetRow _PlayerRow; + uint32 _DispersionRadius; +}; + + ////////////////////////////////////////////////////////////////////////////// // CGrpProfileIdle // ////////////////////////////////////////////////////////////////////////////// @@ -792,6 +835,10 @@ public: static std::string scriptFactionToFameFaction(std::string name); static std::string fameFactionToScriptFaction(std::string name); + static bool scriptFactionToFameFactionGreaterThan(std::string name); + static sint32 scriptFactionToFameFactionValue(std::string name); + + private: CAITimer _checkTargetTimer; bool bNoAssist; diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp index 3803462cd..a85e8fe1c 100644 --- a/code/ryzom/server/src/ai_service/commands.cpp +++ b/code/ryzom/server/src/ai_service/commands.cpp @@ -259,7 +259,7 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", " std::string botsName; if (args.size()>8) botsName = args[8]; - aiInstance->eventCreateNpcGroup(nbBots, sheetId, CAIVector(x, y), dispersionRadius, spawnBots, orientation, botsName); + aiInstance->eventCreateNpcGroup(nbBots, sheetId, CAIVector(x, y), dispersionRadius, spawnBots, orientation, botsName, ""); return true; } diff --git a/code/ryzom/server/src/ai_service/generic_logic_action.cpp b/code/ryzom/server/src/ai_service/generic_logic_action.cpp index 5bcb13fca..64c620cb6 100644 --- a/code/ryzom/server/src/ai_service/generic_logic_action.cpp +++ b/code/ryzom/server/src/ai_service/generic_logic_action.cpp @@ -3013,7 +3013,10 @@ public: } if(!_Id) - npcChatToChannelSentence(bot->dataSetRow(),CChatGroup::say,_Sentence); + { + ucstring ucstr = _Sentence; + npcChatToChannelSentence(bot->dataSetRow(),CChatGroup::say, ucstr); + } else { if(!_Arg) diff --git a/code/ryzom/server/src/ai_service/messages.cpp b/code/ryzom/server/src/ai_service/messages.cpp index 64730a1b7..092ab39f8 100644 --- a/code/ryzom/server/src/ai_service/messages.cpp +++ b/code/ryzom/server/src/ai_service/messages.cpp @@ -697,7 +697,8 @@ void CMessages::init() TRANSPORT_CLASS_REGISTER (CReportStaticAIInstanceMsg); TRANSPORT_CLASS_REGISTER (CReportAIInstanceDespawnMsg); TRANSPORT_CLASS_REGISTER (CWarnBadInstanceMsgImp); - + TRANSPORT_CLASS_REGISTER (CCreatureSetUrlMsg); + TRANSPORT_CLASS_REGISTER (CChangeCreatureMaxHPMsg) TRANSPORT_CLASS_REGISTER (CChangeCreatureHPMsg); TRANSPORT_CLASS_REGISTER (CChangeCreatureModeMsgImp); TRANSPORT_CLASS_REGISTER (CQueryEgs); @@ -770,10 +771,10 @@ void CAIAskForInfosOnEntityImp::callback (const std::string &name, NLNET::TServi } break; default: + std::vector strings = phys->getMultiLineInfoString(); + msg.Infos.insert(msg.Infos.end(), strings.begin(), strings.end()); break; } - std::vector strings = phys->getMultiLineInfoString(); - msg.Infos.insert(msg.Infos.end(), strings.begin(), strings.end()); } else { diff --git a/code/ryzom/server/src/ai_service/nf_grp.cpp b/code/ryzom/server/src/ai_service/nf_grp.cpp index 572a589cb..eabe61fd4 100644 --- a/code/ryzom/server/src/ai_service/nf_grp.cpp +++ b/code/ryzom/server/src/ai_service/nf_grp.cpp @@ -1497,6 +1497,41 @@ void setAutoSpawn_f_(CStateInstance* entity, CScriptStack& stack) // HP related methods /** @page code +@subsection setMaxHP_ff_ +Sets the Max HP level of each bot of the group. + +Arguments: f(MaxHp) f(SetFull) -> +@param[in] MaxHP is the new maximum HP for each bot +@param[in] SetFull if not 0, will set the HP to the new maximum + +@code +()setMaxHP(50000,1); +@endcode + +*/ +// CGroup +void setMaxHP_ff_(CStateInstance* entity, CScriptStack& stack) +{ + bool setFull = ((float)stack.top() != 0.f); stack.pop(); + float maxHp = ((float)stack.top()); stack.pop(); + + CChangeCreatureMaxHPMsg& msgList = CAIS::instance().getCreatureChangeMaxHP(); + + FOREACH(bot, CCont, entity->getGroup()->bots()) + { + if (!bot->isSpawned()) + continue; + + CSpawnBot* const sbot = bot->getSpawnObj(); + + msgList.Entities.push_back(sbot->dataSetRow()); + msgList.MaxHp.push_back((uint32)(maxHp)); + msgList.SetFull.push_back((uint8)(setFull?1:0)); + } +} + +/** @page code + @subsection setHPLevel_f_ Sets the current HP level of each bot of the group. @@ -1573,10 +1608,42 @@ void setHPScale_f_(CStateInstance* entity, CScriptStack& stack) } } +//---------------------------------------------------------------------------- +// Url related method +/** @page code +@subsection setUrl_ss_ +Sets the name and url of right-click action +Arguments: s(actionName),s(url) -> +@param[in] actionName of action when player mouse over +@param[in] url of action when player mouse over +@code +()setUrl("Click on Me", "http://www.domain.com/script.php"); +@endcode +*/ +// CGroup +void setUrl_ss_(CStateInstance* entity, CScriptStack& stack) +{ + std::string url = (std::string)stack.top();stack.pop(); + std::string actionName = (std::string)stack.top();stack.pop(); + + CCreatureSetUrlMsg msg; + FOREACH(botIt, CCont, entity->getGroup()->bots()) + { + CSpawnBot* pbot = botIt->getSpawnObj(); + if (pbot!=NULL) + { + msg.Entities.push_back(pbot->dataSetRow()); + } + } + + msg.ActionName = actionName; + msg.Url = url; + msg.send(egsString); +} @@ -1870,7 +1937,7 @@ Arguments: s(parameterName) -> @param[in] parameterName is a the id of the parameter to add @code -()addProfileParameter("running"); // équivalent ŕ un parameter "running" dans la primitive du groupe +()addProfileParameter("running"); // equivalent to "running" parameter in group primitive @endcode */ @@ -1898,7 +1965,7 @@ Arguments: s(parameterName),s(parameterContent) -> @param[in] parameterContent is the value of the parameter @code -()addProfileParameter("foo", "bar"); // équivalent ŕ un parameter "foo:bar" dans la primitive du groupe +()addProfileParameter("foo", "bar"); // equivalent to "foo:bar" parameter in group primitive @endcode */ @@ -1927,7 +1994,7 @@ Arguments: s(parameterName),f(parameterContent) -> @param[in] parameterContent is the value of the parameter @code -()addProfileParameter("foo", 0.5); // équivalent ŕ un parameter "foo:0.5" dans la primitive du groupe +()addProfileParameter("foo", 0.5); // equivalent to "foo:0.5" parameter in group primitive @endcode */ @@ -4456,6 +4523,37 @@ void setSheet_s_(CStateInstance* entity, CScriptStack& stack) } } +//---------------------------------------------------------------------------- +/** @page code + +@subsection setClientSheet_s_ +Change the client sheet of a creature + +Arguments: -> s(sheetName) + +@code +()setClientSheet('ccdeb2'); + +@endcode + +*/ +void setClientSheet_s_(CStateInstance* entity, CScriptStack& stack) +{ + string sheetname = stack.top(); + stack.pop(); + + if (sheetname.find(".creature") == string::npos) + sheetname += ".creature"; + + FOREACH(itBot, CCont, entity->getGroup()->bots()) + { + CBot* bot = *itBot; + if (bot) + { + bot->setClientSheet(sheetname); + } + } +} /****************************************************************************/ @@ -4581,6 +4679,62 @@ void setConditionSuccess_f_(CStateInstance* entity, CScriptStack& stack) CAILogicDynamicIfHelper::setConditionSuccess(conditionState); } +inline +static float randomAngle() +{ + uint32 const maxLimit = CAngle::PI*2; + float val = (float)CAIS::rand32(maxLimit); + return val; +} + +//---------------------------------------------------------------------------- +/** @page code + +@subsection facing_f_ + +The npc will face the given direction + + +Arguments: f(direction) +@param[in] direction is the new angle of the bot in radians + +@code +()facing(3.14); +@endcode + +*/ + +// CStateInstance +void facing_f_(CStateInstance* entity, CScriptStack& stack) +{ + float const theta = (float)stack.top(); stack.pop(); + CGroup* group = entity->getGroup(); + + bool bRandomAngle = false; + if (theta > (NLMISC::Pi * 2.0) || theta < (-NLMISC::Pi * 2.0)) + bRandomAngle = true; + + if (group->isSpawned()) + { + FOREACH(itBot, CCont, group->bots()) + { + CBot* bot = *itBot; + if (bot) + { + if (bot->isSpawned()) + { + CSpawnBot *spawnBot = bot->getSpawnObj(); + + if (bRandomAngle) + spawnBot->setTheta(randomAngle()); + else + spawnBot->setTheta(theta); + + } + } + } + } +} std::map nfGetGroupNativeFunctions() { @@ -4628,6 +4782,7 @@ std::map nfGetGroupNativeFunctions() REGISTER_NATIVE_FUNC(functions, clearAggroList__); REGISTER_NATIVE_FUNC(functions, setMode_s_); REGISTER_NATIVE_FUNC(functions, setAutoSpawn_f_); + REGISTER_NATIVE_FUNC(functions, setMaxHP_ff_); REGISTER_NATIVE_FUNC(functions, setHPLevel_f_); REGISTER_NATIVE_FUNC(functions, setHPScale_f_); REGISTER_NATIVE_FUNC(functions, scaleHP_f_); @@ -4651,10 +4806,11 @@ std::map nfGetGroupNativeFunctions() REGISTER_NATIVE_FUNC(functions, getEventParam_f_f); REGISTER_NATIVE_FUNC(functions, getEventParam_f_s); REGISTER_NATIVE_FUNC(functions, setSheet_s_); + REGISTER_NATIVE_FUNC(functions, setClientSheet_s_); REGISTER_NATIVE_FUNC(functions, setHealer_f_); REGISTER_NATIVE_FUNC(functions, setConditionSuccess_f_); - - + REGISTER_NATIVE_FUNC(functions, facing_f_); + REGISTER_NATIVE_FUNC(functions, setUrl_ss_); // Boss functions (custom text) REGISTER_NATIVE_FUNC(functions, phraseBegin__); @@ -4699,10 +4855,7 @@ std::map nfGetGroupNativeFunctions() REGISTER_NATIVE_FUNC(functions, teleportPlayer_sffff_); REGISTER_NATIVE_FUNC(functions, summonPlayer_fs_); - - - #undef REGISTER_NATIVE_FUNC return functions; diff --git a/code/ryzom/server/src/ai_service/nf_grp_npc.cpp b/code/ryzom/server/src/ai_service/nf_grp_npc.cpp index d8ae543a5..2ea93b625 100644 --- a/code/ryzom/server/src/ai_service/nf_grp_npc.cpp +++ b/code/ryzom/server/src/ai_service/nf_grp_npc.cpp @@ -462,7 +462,7 @@ Arguments: f(Radius) -> @param[in] Radius dispersion of wander activity @code -()startWander(100); // Gives a wander activity to the group with dispersion of 100 +()startMoving(100,-100,10); // Moves the group to 100,-100 with radius of 10 @endcode */ @@ -501,6 +501,56 @@ void startMoving_fff_(CStateInstance* entity, CScriptStack& stack) return; } +//---------------------------------------------------------------------------- +/** @page code + +@subsection followPlayer_sf_ +Set activity to follow the given player + +Arguments: s(PlayerEid) f(Radius) -> +@param[in] PlayerEid id of player to follow +@param[in] Radius dispersion of wander activity + +@code +()followPlayer("(0x0002015bb4:01:88:88)",10); +@endcode + +*/ +// Spawned CGroupNpc not in a family behaviour +void followPlayer_sf_(CStateInstance* entity, CScriptStack& stack) +{ + uint32 dispersionRadius = (uint32)(float&)stack.top(); stack.pop(); + NLMISC::CEntityId playerId = NLMISC::CEntityId((std::string)stack.top()); + + IManagerParent* const managerParent = entity->getGroup()->getOwner()->getOwner(); + CAIInstance* const aiInstance = dynamic_cast(managerParent); + if (!aiInstance) + return; + + if (!entity) { nlwarning("followPlayer failed!"); return; } + + CGroupNpc* group = dynamic_cast(entity->getGroup()); + if (!group) + { nlwarning("followPlayer failed: no NPC group"); + return; + } + CSpawnGroupNpc* spawnGroup = group->getSpawnObj(); + if (!spawnGroup) + { nlwarning("followPlayer failed: no spawned group"); + return; + } + + if (playerId == CEntityId::Unknown) + { + nlwarning("followPlayer failed: unknown player"); + DEBUG_STOP; + return; + } + + spawnGroup->movingProfile().setAIProfile(new CGrpProfileFollowPlayer(spawnGroup, TheDataset.getDataSetRow(playerId), dispersionRadius)); + + return; +} //---------------------------------------------------------------------------- @@ -2179,14 +2229,11 @@ void facing_cscs_(CStateInstance* entity, CScriptStack& stack) // bot1->setTheta(bot1->pos().angleTo(bot2->pos())); } - //---------------------------------------------------------------------------- /** @page code @subsection npcSay_css_ -A new entry of the npc contextual menu will propose to the targeter player to talk to the npc. - Make a npc say a text There are 3 type of text @@ -2201,9 +2248,9 @@ Arguments: c(group), s(botname), s(text), -> @code (@group)group_name.context(); -()emote(@group, "bob", "DSS_1601 RtEntryText_6") ;// Send To dss -()emote(@group, "bob", "RAW Ca farte?"); // phrase direcly send to IOS as raw (for debug) -()emote(@group, "bob", "answer_group_no_m"); //phrase id +()npcSay(@group, "bob", "DSS_1601 RtEntryText_6") ;// Send To dss +()npcSay(@group, "bob", "RAW Ca farte?"); // phrase direcly send to IOS as raw (for debug) +()npcSay(@group, "bob", "answer_group_no_m"); //phrase id @endcode @@ -2214,6 +2261,34 @@ Arguments: c(group), s(botname), s(text), -> #include "game_share/chat_group.h" #include "game_share/send_chat.h" +void execSayHelper(CSpawnBot *spawnBot, NLMISC::CSString text, CChatGroup::TGroupType mode = CChatGroup::say) +{ + if (spawnBot) + { + NLMISC::CSString prefix = text.left(4); + if (prefix=="DSS_") + { + + NLMISC::CSString phrase = text.right(text.length() - 4); + NLMISC::CSString idStr = phrase.strtok(" ",false,false,false,false); + uint32 scenarioId = atoi(idStr.c_str()); + forwardToDss(spawnBot->dataSetRow(), mode, phrase, scenarioId); + return; + } + + if (prefix=="RAW ") + { + std::string phrase = text.right(text.length()-4); + ucstring ucstr = phrase; + npcChatToChannelSentence(spawnBot->dataSetRow(), mode, ucstr); + return; + } + + //Classic phrase ID + npcChatToChannel(spawnBot->dataSetRow(), mode, text); + } +} + void npcSay_css_(CStateInstance* entity, CScriptStack& stack) { string text = (string)stack.top(); stack.pop(); @@ -2224,29 +2299,58 @@ void npcSay_css_(CStateInstance* entity, CScriptStack& stack) if (!spawnBot) { return; } + execSayHelper(spawnBot, text); +} - std::string prefix =NLMISC::CSString (text).left(4); - if(prefix=="DSS_") - { - - NLMISC::CSString phrase = NLMISC::CSString (text).right((uint)text.length()-4); - NLMISC::CSString idStr = phrase.strtok(" ",false,false,false,false); - uint32 scenarioId; - NLMISC::fromString(idStr, scenarioId); - forwardToDss(spawnBot->dataSetRow(), CChatGroup::say, phrase, scenarioId); - return; - } - - if (prefix=="RAW ") - { - NLMISC::CSString phrase = NLMISC::CSString (text).right((uint)text.length()-4); - npcChatToChannelSentence(spawnBot->dataSetRow(),CChatGroup::say, phrase); - return; - } +//---------------------------------------------------------------------------- +/** @page code - //Classic phrase ID - npcChatToChannel(spawnBot->dataSetRow(), CChatGroup::say, text); - return; +@subsection npcSay_ss_ + +Make a npc say a text + +Arguments: s(text), s(mode) -> +@param[in] text is the text to say. prefix with ID: to use an id +@param[in] mode is the mode to use (say, shout) + +@code +()npcSay("Hello!","say"); // phrase direcly send to IOS as raw +()npcSay("ID:answer_group_no_m","shout"); // phrase id +@endcode + +*/ + +void npcSay_ss_(CStateInstance* entity, CScriptStack& stack) +{ + std::string sMode = (std::string)stack.top(); stack.pop(); + std::string text = (std::string)stack.top(); stack.pop(); + + CChatGroup::TGroupType mode = CChatGroup::say; + mode = CChatGroup::stringToGroupType(sMode); + CGroup* group = entity->getGroup(); + + if (group->isSpawned()) + { + FOREACH(itBot, CCont, group->bots()) + { + CBot* bot = *itBot; + if (bot) + { + if (bot->isSpawned()) + { + CSpawnBot *spawnBot = bot->getSpawnObj(); + std::string prefix = NLMISC::CSString(text).left(3); + if (NLMISC::nlstricmp(prefix.c_str(), "id:") == 0) { + text = NLMISC::CSString(text).right(text.length()-3); + execSayHelper(spawnBot, text, mode); + } + else { + execSayHelper(spawnBot, "RAW " + text, mode); + } + } + } + } + } } @@ -2514,6 +2618,7 @@ void rename_s_(CStateInstance* entity, CScriptStack& stack) msgout.serial(row); msgout.serial(name); sendMessageViaMirror("IOS", msgout); + bot->setCustomName(name); } } } @@ -2650,6 +2755,7 @@ std::map nfGetNpcGroupNativeFunctions() REGISTER_NATIVE_FUNC(functions, startMoving_fff_); REGISTER_NATIVE_FUNC(functions, waitInZone_s_); REGISTER_NATIVE_FUNC(functions, stopMoving__); + REGISTER_NATIVE_FUNC(functions, followPlayer_sf_); REGISTER_NATIVE_FUNC(functions, wander__); REGISTER_NATIVE_FUNC(functions, setAttackable_f_); REGISTER_NATIVE_FUNC(functions, setPlayerAttackable_f_); @@ -2687,6 +2793,7 @@ std::map nfGetNpcGroupNativeFunctions() REGISTER_NATIVE_FUNC(functions, rename_s_); REGISTER_NATIVE_FUNC(functions, vpx_s_); REGISTER_NATIVE_FUNC(functions, npcSay_css_); + REGISTER_NATIVE_FUNC(functions, npcSay_ss_); REGISTER_NATIVE_FUNC(functions, dssMessage_fsss_); REGISTER_NATIVE_FUNC(functions, despawnBotByAlias_s_); REGISTER_NATIVE_FUNC(functions, giveReward_ssssc_); diff --git a/code/ryzom/server/src/ai_service/nf_static.cpp b/code/ryzom/server/src/ai_service/nf_static.cpp index fa1699b4b..4523d3e1d 100644 --- a/code/ryzom/server/src/ai_service/nf_static.cpp +++ b/code/ryzom/server/src/ai_service/nf_static.cpp @@ -1000,8 +1000,8 @@ void setSimplePhrase_ss_(CStateInstance* entity, CScriptStack& stack) phraseContent2 += "]}"; ucstring ucPhraseContent; -// ucPhraseContent.fromUtf8(phraseContent2); // utf-8 version - ucPhraseContent = phraseContent2; // iso-8859-1 version + ucPhraseContent.fromUtf8(phraseContent2); // utf-8 version + //ucPhraseContent = phraseContent2; // iso-8859-1 version NLNET::CMessage msgout("SET_PHRASE"); msgout.serial(phraseName); @@ -1009,6 +1009,33 @@ void setSimplePhrase_ss_(CStateInstance* entity, CScriptStack& stack) sendMessageViaMirror("IOS", msgout); } +void setSimplePhrase_sss_(CStateInstance* entity, CScriptStack& stack) +{ + std::string lang = (std::string)stack.top(); + stack.pop(); + std::string phraseContent = (std::string)stack.top(); + stack.pop(); + std::string phraseName = (std::string)stack.top(); + stack.pop(); + + std::string phraseContent2; + phraseContent2 += phraseName; + phraseContent2 += "(){["; + phraseContent2 += phraseContent; + phraseContent2 += "]}"; + + ucstring ucPhraseContent; + ucPhraseContent.fromUtf8(phraseContent2); // utf-8 version + //ucPhraseContent = phraseContent2; // iso-8859-1 version + + NLNET::CMessage msgout("SET_PHRASE_LANG"); + msgout.serial(phraseName); + msgout.serial(ucPhraseContent); + msgout.serial(lang); + sendMessageViaMirror("IOS", msgout); +} + + //---------------------------------------------------------------------------- /** @page code @@ -1330,6 +1357,7 @@ std::map nfGetStaticNativeFunctions() REGISTER_NATIVE_FUNC(functions, getNamedEntityProp_ss_s); REGISTER_NATIVE_FUNC(functions, destroyNamedEntity_s_); REGISTER_NATIVE_FUNC(functions, setSimplePhrase_ss_); + REGISTER_NATIVE_FUNC(functions, setSimplePhrase_sss_); REGISTER_NATIVE_FUNC(functions, dataGetVar_s_s); REGISTER_NATIVE_FUNC(functions, dataGetVar_s_f); REGISTER_NATIVE_FUNC(functions, dataSetVar_ss_); diff --git a/code/ryzom/server/src/ai_service/npc_description_msg.cpp b/code/ryzom/server/src/ai_service/npc_description_msg.cpp index 70989be8d..ebe7701a7 100644 --- a/code/ryzom/server/src/ai_service/npc_description_msg.cpp +++ b/code/ryzom/server/src/ai_service/npc_description_msg.cpp @@ -788,6 +788,13 @@ bool CNpcChatProfileImp::parseChatArgs(CAIInstance *aiInstance, const std::strin return true; } + // organization entry + if (NLMISC::nlstricmp(keyword, "organization") == 0) + { + NLMISC::fromString(tail, _Organization); + return true; + } + // if no match found throw an error return false; } @@ -830,4 +837,5 @@ void TGenNpcDescMsgImp::setChat(const CNpcChatProfileImp& chatProfile) _OptionalProperties = chatProfile.getOptionalProperties(); _Outpost = chatProfile.getOutpost(); + _Organization = chatProfile.getOrganization(); } diff --git a/code/ryzom/server/src/ai_service/npc_description_msg.h b/code/ryzom/server/src/ai_service/npc_description_msg.h index e29bdfd13..14c94e9b1 100644 --- a/code/ryzom/server/src/ai_service/npc_description_msg.h +++ b/code/ryzom/server/src/ai_service/npc_description_msg.h @@ -36,7 +36,7 @@ public: CNpcChatProfileImp(const CNpcChatProfileImp &other0,const CNpcChatProfileImp &other1); // interface for setting up chat info - void clear() { clearShopInfo(); clearMissions(); clearCellZones(); clearContextOption(); _OptionalProperties.clear(); } + void clear() { clearShopInfo(); clearMissions(); clearCellZones(); clearContextOption(); clearWeb(); _OptionalProperties.clear(); } void clearShopInfo() { _ShopTypes.clear(); @@ -56,6 +56,11 @@ public: } void clearCellZones() { _CellZones.clear(); } void clearMissions() { _Missions.clear(); } + void clearWeb() + { + _WebPage.clear(); + _WebPageName.clear(); + } bool add(CAIInstance *aiInstance, const std::string &chatArgs) { return parseChatArgs(aiInstance, chatArgs); } void addMission(uint32 mission) { _Missions.push_back(mission); } void clearContextOption() { _ContextOptions.clear(); } diff --git a/code/ryzom/server/src/ai_service/script_compiler.cpp b/code/ryzom/server/src/ai_service/script_compiler.cpp index aabe5889c..03d0fe336 100644 --- a/code/ryzom/server/src/ai_service/script_compiler.cpp +++ b/code/ryzom/server/src/ai_service/script_compiler.cpp @@ -1083,25 +1083,33 @@ CSmartPtr CCompiler::compileCode (const std::vector=str.size()) + size_t index = str.find("//",0); + if (index == string::npos) + code += str; + else { + // We have a potential comment. Now check if it is quoted or not + bool inQuote = false; + uint i = 0; + for (;;) { - firstIndex=string::npos; - break; - } + if ('"' == str[i]) + inQuote = !inQuote; - if (str.at(firstIndex)=='/') - { - code+=str.substr(0, firstIndex-1); - break; + if ( !inQuote && ('/' == str[i]) ) + { + ++i; + if ('/' == str[i]) + break; + + code += '/'; + } + code += str[i]; + ++i; + if (str.size() == i) + break; } - firstIndex=str.find_first_of("/",firstIndex); } - if (firstIndex==string::npos) - code+=str; + code+="\n "; // additional .. } code+="}"; diff --git a/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp b/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp index 17bc605c4..dc6b36861 100644 --- a/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp +++ b/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp @@ -221,10 +221,12 @@ arguments. - @ref moveToZone_ss_ - @ref waitInZone_s_ - @ref stopMoving__ +- @ref followPlayer_sf_ - @ref wander__ - @ref downScaleHP_f_ - @ref upScaleHP_f_ - @ref scaleHP_f_ +- @ref setMaxHP_ff_ - @ref setHPLevel_f_ - @ref addHP_f_ - @ref aiAction_s_ diff --git a/code/ryzom/server/src/ai_service/visual_properties_interface.cpp b/code/ryzom/server/src/ai_service/visual_properties_interface.cpp index e495319f4..20d79f038 100644 --- a/code/ryzom/server/src/ai_service/visual_properties_interface.cpp +++ b/code/ryzom/server/src/ai_service/visual_properties_interface.cpp @@ -69,7 +69,7 @@ void CVisualPropertiesInterface::release() } // set different visual properties for a bot. -void CVisualPropertiesInterface::setName(const TDataSetRow& dataSetRow,std::string name) +void CVisualPropertiesInterface::setName(const TDataSetRow& dataSetRow, ucstring name) { if (!IOSHasMirrorReady) return; @@ -77,8 +77,6 @@ void CVisualPropertiesInterface::setName(const TDataSetRow& dataSetRow,std::stri NLNET::CMessage msgout("CHARACTER_NAME"); CEntityId eid=CMirrors::DataSet->getEntityId(dataSetRow); msgout.serial (const_cast(dataSetRow)); - ucstring uname; - uname.fromUtf8(name); - msgout.serial (uname); // Daniel: TODO update all name dependencies to ucstring in your service. + msgout.serial (name); sendMessageViaMirror("IOS",msgout); } diff --git a/code/ryzom/server/src/ai_service/visual_properties_interface.h b/code/ryzom/server/src/ai_service/visual_properties_interface.h index 75d5c5a6d..d814e91da 100644 --- a/code/ryzom/server/src/ai_service/visual_properties_interface.h +++ b/code/ryzom/server/src/ai_service/visual_properties_interface.h @@ -39,7 +39,7 @@ public: static void release(); // set different visual properties for an entity - static void setName(const TDataSetRow& dataSetRow,std::string name); + static void setName(const TDataSetRow& dataSetRow, ucstring name); // static void setMode(CAIEntityId id,MBEHAV::EMode mode); // static void setBehaviour(CAIEntityId id,MBEHAV::EBehaviour behaviour); diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp index 502128805..801b6dd22 100644 --- a/code/ryzom/server/src/entities_game_service/admin.cpp +++ b/code/ryzom/server/src/entities_game_service/admin.cpp @@ -15,7 +15,6 @@ // along with this program. If not, see . - // // User Privilege set in the mysql database must be like that ":GM:" or "" or ":GM:ADMIN:" .... // @@ -52,8 +51,6 @@ #include "game_share/shard_names.h" #include "server_share/log_command_gen.h" #include "server_share/r2_vision.h" -#include "server_share/log_item_gen.h" -#include "server_share/log_character_gen.h" #include "egs_sheets/egs_sheets.h" #include "egs_sheets/egs_static_rolemaster_phrase.h" @@ -75,6 +72,8 @@ #include "team_manager/team_manager.h" #include "world_instances.h" #include "egs_variables.h" +#include "building_manager/building_manager.h" +#include "building_manager/building_physical.h" #include "player_manager/gm_tp_pending_command.h" #include "guild_manager/guild_manager.h" #include "guild_manager/guild.h" @@ -104,6 +103,10 @@ #include "modules/shard_unifier_client.h" #include "modules/client_command_forwarder.h" #include "modules/guild_unifier.h" +#include "server_share/log_command_gen.h" +#include "server_share/log_item_gen.h" +#include "server_share/log_character_gen.h" +#include "server_share/used_continent.h" // // Externs @@ -162,6 +165,9 @@ AdminCommandsInit[] = { // player character accessible commands "teamInvite", true, + "setLeague", true, + "leagueInvite", true, + "leagueKick", true, "guildInvite", true, "roomInvite", true, "roomKick", true, @@ -174,6 +180,8 @@ AdminCommandsInit[] = "validateRespawnPoint", true, "summonPet", true, "connectUserChannel", true, + "updateTarget", true, + "resetName", true, // Web commands managment "webExecCommand", true, @@ -216,6 +224,7 @@ AdminCommandsInit[] = "allowSummonPet", true, "setPetAnimalSatiety", true, "getPetAnimalSatiety", true, + "setPetAnimalName", true, "taskPass", true, "setFamePlayer", true, "guildMOTD", true, @@ -230,7 +239,7 @@ AdminCommandsInit[] = "renamePlayerForEvent", true, "renamePlayer", true, "renameGuild", true, - "setGuildDescription", true, + "setGuildDescription", false, "setGuildIcon", false, "killMob", true, "changeVar", true, @@ -295,12 +304,15 @@ AdminCommandsInit[] = "Position", true, "Priv", true, "PriviledgePVP", true, + "FullPVP", true, "FBT", true, "RyzomDate", false, "RyzomTime", false, "addGuildXp", false, "setGuildChargePoint", false, - + "characterInventoryDump", true, + "deleteInventoryItem", true, + "setSimplePhrase", false, // PUT HERE THE VARIABLE / COMMAND THAT ARE TEMPORARY // remove when message of the day interface is ready @@ -311,6 +323,8 @@ AdminCommandsInit[] = "EntitiesNoActionFailure", false, "EntitiesNoCastBreak", false, "EntitiesNoResist", false, + "lockItem", true, + "setTeamLeader", true, // aggroable state "Aggro", true, @@ -373,6 +387,15 @@ AdminCommandsInit[] = "eventSetBotURL", true, "eventSetBotURLName", true, "eventSpawnToxic", true, + "eventNpcSay", true, + "eventSetBotFacing", true, + "eventGiveControl", true, + "eventLeaveControl", true, + + "setOrganization", true, + "setOrganizationStatus", true, + + "addGuildBuilding", true, }; static vector AdminCommands; @@ -387,6 +410,22 @@ static void loadCommandsPrivileges(const string & fileName, bool init); void cbRemoteClientCallback (uint32 rid, const std::string &cmd, const std::string &entityNames); // +// get AI instance and remove it form the group name +bool getAIInstanceFromGroupName(string& groupName, uint32& instanceNumber) +{ + if (groupName.find("@") != string::npos) + { + string continent = groupName.substr(0, groupName.find('@')); + uint32 nr = CUsedContinent::instance().getInstanceForContinent(continent); + if (nr == ~0) + { + return false; + } + instanceNumber = nr; + groupName = groupName.substr(groupName.find('@'), groupName.size()); + } + return true; +} CAdminCommand * findAdminCommand(const string & name) { @@ -432,6 +471,7 @@ void initCommandsPrivileges(const std::string & fileName) { H_AUTO(initCommandsPrivileges); + initSalt(); loadCommandsPrivileges(fileName, true); } @@ -553,43 +593,46 @@ void initPositionFlags(const std::string & fileName) PositionFlagsFileName = fileName; } -string getSalt() +struct SaltFileLoadCallback: public IBackupFileReceiveCallback { - if (Salt.empty()) + std::string FileName; + + SaltFileLoadCallback(const std::string& fileName): FileName(fileName) {} + + virtual void callback(const CFileDescription& fileDescription, NLMISC::IStream& dataStream) { - string fileNameAndPath = Bsi.getLocalPath() + "salt.txt"; - if (CFile::fileExists(fileNameAndPath)) - { - FILE* f; - string fileName; - - // open the file - f=fopen(fileNameAndPath.c_str(),"rb"); - if (f == NULL) - { - nlinfo("Failed to open file for reading: %s", fileName.c_str() ); - return false; - } - - CSString input; - // read the file content into a buffer - uint32 size=NLMISC::CFile::getFileSize(f); - input.resize(size); - uint32 readSize= (uint32)fread(&input[0],1,size,f); - fclose(f); - Salt = input; - return Salt; - } - return ""; + // if the file isn't found then just give up + DROP_IF(fileDescription.FileName.empty()," file not found: "<< FileName, return); + + dataStream.serial(Salt); + nlinfo("Salt loaded : %s", Salt.c_str()); } +}; + +void initSalt() +{ + H_AUTO(initSalt); + + string fileNameAndPath = Bsi.getLocalPath() + "salt_egs.txt"; + if (CFile::fileExists(fileNameAndPath)) + { + nlinfo("Salt loading : salt_egs.txt"); + Bsi.syncLoadFile("salt_egs.txt", new SaltFileLoadCallback("salt_egs.txt")); + } +} + +const string &getSalt() +{ + if (Salt.empty()) Salt = "abcdefghijklmnopqrstuvwxyz0123456"; + return Salt; } void saveSalt(const string salt) { Salt = salt; - CBackupMsgSaveFile msg("salt.txt", CBackupMsgSaveFile::SaveFile, Bsi ); - msg.DataMsg.serialBuffer((uint8*)Salt.c_str(), (uint)Salt.size()); + CBackupMsgSaveFile msg("salt_egs.txt", CBackupMsgSaveFile::SaveFile, Bsi ); + msg.DataMsg.serial(Salt); Bsi.sendFile(msg); } @@ -1087,11 +1130,16 @@ ENTITY_VARIABLE(Position, "Position of a player (in meter) ,[, explode (value, string(","), res); if (res.size() >= 2) { - x = atoi (res[0].c_str()) * 1000; - y = atoi (res[1].c_str()) * 1000; + fromString(res[0], x); + x *= 1000; + fromString(res[1], y); + y *= 1000; } if (res.size() >= 3) - z = atoi (res[2].c_str()) * 1000; + { + fromString(res[2], z); + z *= 1000; + } } else { @@ -2222,13 +2270,19 @@ NLMISC_COMMAND(addPetAnimal,"Add pet animal to character"," ") { CGameItemPtr item = c->createItemInInventoryFreeSlot(INVENTORIES::bag, 1, 1, ticket); if( item != 0 ) - c->addCharacterAnimal( ticket, 0, item ); - return true; - } - else - { - log.displayNL(" command, unknown pet ticket '%s'", args[1].c_str() ); + { + if ( ! c->addCharacterAnimal( ticket, 0, item )) + { + item.deleteItem(); + return false; + } + return true; + } + + log.displayNL(" command, cannot create item in bag '%s'", args[1].c_str() ); } + + log.displayNL(" command, unknown pet ticket '%s'", args[1].c_str() ); } return false; @@ -2271,7 +2325,9 @@ NLMISC_COMMAND(setPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0 if ( addressee ) { CHECK_RIGHT( addressee, c ); - CCharacter::sendDynamicSystemMessage( addressee->getId(), result ); + SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal); + params[0].Literal = trim(result); + CCharacter::sendDynamicSystemMessage(addressee->getId(), "LITERAL", params); } else result += " nameForAnswer not found"; @@ -2283,7 +2339,7 @@ NLMISC_COMMAND(setPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0 return true; } -NLMISC_COMMAND(getPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0..3)"," []") +NLMISC_COMMAND(getPetAnimalSatiety,"Get the satiety of pet animal (petIndex in 0..3)"," []") { if (args.size () < 2) return false; GET_CHARACTER @@ -2307,7 +2363,9 @@ NLMISC_COMMAND(getPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0 if ( addressee ) { CHECK_RIGHT( addressee, c ); - CCharacter::sendDynamicSystemMessage( addressee->getId(), result ); + SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal); + params[0].Literal = trim(result); + CCharacter::sendDynamicSystemMessage(addressee->getId(), "LITERAL", params); } else result += " nameForAnswer not found"; @@ -2318,6 +2376,22 @@ NLMISC_COMMAND(getPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0 return true; } +NLMISC_COMMAND(setPetAnimalName, "Set the name of a pet animal (petIndex in 0..3)"," ") +{ + if (args.size () < 3) return false; + GET_CHARACTER + + if ( c ) + { + uint petIndex; + fromString(args[1], petIndex); + ucstring customName = args[2]; + c->setAnimalName(petIndex, customName); + } + + return true; +} + NLMISC_COMMAND (addSkillPoints, "add skill points of given type (Fight = 0, Magic = 1,Craft = 2, Harvest = 3)", " ") { if (args.size () < 3) return false; @@ -2330,7 +2404,8 @@ NLMISC_COMMAND (addSkillPoints, "add skill points of given type (Fight = 0, Magi return false; } - uint32 nbSP = atoi (args[2].c_str()); + uint32 nbSP; + fromString(args[2], nbSP); c->addSP( nbSP, type ); @@ -3723,7 +3798,7 @@ NLMISC_COMMAND( failMission, "force mission failure", "" ) //---------------------------------------------------------------------------- NLMISC_COMMAND( progressMission, "force mission progression", "[repeat]") { - if ( args.size() != 2 || args.size() != 3 ) + if ( args.size() != 2 && args.size() != 3 ) return false; GET_CHARACTER; @@ -3964,15 +4039,15 @@ NLMISC_COMMAND (targetInfos, "give infos on the target", "") //---------------------------------------------------------------------------- NLMISC_COMMAND (infos, "give info on character (GodMode, Invisible...)", "") { - CSString str("GM STATUS: "); + CSString str("INFO: "); GET_CHARACTER if( c->invulnerableMode() ) { - str << "INVULNERABLE MODE "; + str << "INVULNERABLE_MODE "; } if( c->godMode() ) { - str << "GOD MODE "; + str << "GOD_MODE "; } else { @@ -3988,31 +4063,29 @@ NLMISC_COMMAND (infos, "give info on character (GodMode, Invisible...)", "") { if (IsRingShard) { - str << "INVISIBLE(" <getWhoSeesMe()) << ")"; + str << "INVISIBLE(" <getWhoSeesMe()) << ") "; } else { - str << "INVISIBLE"; + str << "INVISIBLE "; } } if ( IsRingShard && R2_VISION::extractVisionLevel(c->getWhoSeesMe())!=R2_VISION::VISIBLE ) { - str << "SEEINVIS(" << R2_VISION::extractVisionLevel(c->getWhoSeesMe()) << ")"; + str << "SEEINVIS(" << R2_VISION::extractVisionLevel(c->getWhoSeesMe()) << ") "; } if (c->getAggroableSave()) { - str << " AGGROABLE"; + str << "AGGROABLE "; } else { - str << " NOT_AGGROABLE"; + str << "NOT_AGGROABLE "; } - SM_STATIC_PARAMS_1(params,STRING_MANAGER::literal); - params[0].Literal = str; - CCharacter::sendDynamicSystemMessage( eid,"LITERAL", params ); + log.displayNL(str.c_str()); return true; } @@ -4156,7 +4229,7 @@ ENTITY_VARIABLE(Invisible, "Invisibility of a player") } //---------------------------------------------------------------------------- -NLMISC_COMMAND(broadcast,"[repeat= or during=