From 8b7144733a952046edc15159eb68cd517b2b6663 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 May 2010 09:26:02 +0200 Subject: [PATCH 1/7] Changed: #866 VER_SUITE_STORAGE_SERVER and VER_SUITE_COMPUTE_SERVER not defined --- code/nel/src/misc/system_info.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/code/nel/src/misc/system_info.cpp b/code/nel/src/misc/system_info.cpp index 5d5bd704f..e48c305b9 100644 --- a/code/nel/src/misc/system_info.cpp +++ b/code/nel/src/misc/system_info.cpp @@ -477,8 +477,10 @@ string CSystemInfo::getOS() { if( GetSystemMetrics(89 /* SM_SERVERR2 */) ) OSString += " Windows Server 2003 R2"; +#ifdef VER_SUITE_STORAGE_SERVER else if ( osvi.wSuiteMask == VER_SUITE_STORAGE_SERVER ) OSString += " Windows Storage Server 2003"; +#endif #ifdef VER_SUITE_WH_SERVER else if ( osvi.wSuiteMask == VER_SUITE_WH_SERVER ) OSString += " Windows Home Server"; @@ -512,14 +514,20 @@ string CSystemInfo::getOS() else { - if ( osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER ) - OSString += " Compute Cluster Edition"; + if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE ) + OSString += " Enterprise Edition"; +#ifdef VER_SUITE_DATACENTER else if( osvi.wSuiteMask & VER_SUITE_DATACENTER ) OSString += " Datacenter Edition"; - else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE ) - OSString += " Enterprise Edition"; +#endif +#ifdef VER_SUITE_BLADE else if ( osvi.wSuiteMask & VER_SUITE_BLADE ) OSString += " Web Edition"; +#endif +#ifdef VER_SUITE_COMPUTE_SERVER + else if ( osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER ) + OSString += " Compute Cluster Edition"; +#endif else OSString += " Standard Edition"; } From c084a595f852ab0704088f219d28a127f2f53d2d Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 May 2010 20:33:08 +0200 Subject: [PATCH 2/7] Changed: #860 Remove/convert/update Visual C++ projects --- code/nel/nel.sln | 62 +++++ code/ryzom/tools/all.sln | 118 +++++++++ .../csv_transform/csv_transform.vcproj | 227 +++++++++++++++++- .../georges_dll/georges_edit_dll.vcproj | 187 ++++++++++++++- .../georges_exe/georges_exe.vcproj | 167 ++++++++++++- .../georges_plugin_sound.vcproj | 169 ++++++++++++- .../mission_compiler_fe.vcproj | 183 +++++++++++++- .../mission_compiler_lib.vcproj | 141 ++++++++++- .../leveldesign/uni_conv/uni_conv.vcproj | 171 ++++++++++++- .../world_editor/world_editor.vcproj | 185 +++++++++++++- .../world_editor_fauna_graph_plugin.vcproj | 187 ++++++++++++++- .../world_editor_graph_plugin.vcproj | 187 ++++++++++++++- .../world_editor_primitive_plugin.vcproj | 169 ++++++++++++- .../world_editor_shard_monitor_plugin.vcproj | 187 ++++++++++++++- .../world_editor_sound_plugin.vcproj | 190 ++++++++++++++- .../translation_tools.vcproj | 170 ++++++++++++- 16 files changed, 2683 insertions(+), 17 deletions(-) diff --git a/code/nel/nel.sln b/code/nel/nel.sln index a7f132e79..0e183d87d 100644 --- a/code/nel/nel.sln +++ b/code/nel/nel.sln @@ -75,69 +75,131 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.ActiveCfg = Debug|Win32 {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.Build.0 = Debug|Win32 + {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|x64.ActiveCfg = Debug|x64 + {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|x64.Build.0 = Debug|x64 {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|Win32.ActiveCfg = Release|Win32 {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|Win32.Build.0 = Release|Win32 + {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.ActiveCfg = Release|x64 + {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.Build.0 = Release|x64 {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|Win32.ActiveCfg = Debug|Win32 {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|Win32.Build.0 = Debug|Win32 + {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|x64.ActiveCfg = Debug|x64 + {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|x64.Build.0 = Debug|x64 {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|Win32.ActiveCfg = Release|Win32 {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|Win32.Build.0 = Release|Win32 + {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|x64.ActiveCfg = Release|x64 + {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|x64.Build.0 = Release|x64 {309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Debug|Win32.ActiveCfg = Debug|Win32 {309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Debug|Win32.Build.0 = Debug|Win32 + {309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Debug|x64.ActiveCfg = Debug|x64 + {309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Debug|x64.Build.0 = Debug|x64 {309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Release|Win32.ActiveCfg = Release|Win32 {309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Release|Win32.Build.0 = Release|Win32 + {309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Release|x64.ActiveCfg = Release|x64 + {309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Release|x64.Build.0 = Release|x64 {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|Win32.ActiveCfg = Debug|Win32 {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|Win32.Build.0 = Debug|Win32 + {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|x64.ActiveCfg = Debug|x64 + {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|x64.Build.0 = Debug|x64 {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|Win32.ActiveCfg = Release|Win32 {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|Win32.Build.0 = Release|Win32 + {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|x64.ActiveCfg = Release|x64 + {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|x64.Build.0 = Release|x64 {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|Win32.ActiveCfg = Debug|Win32 {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|Win32.Build.0 = Debug|Win32 + {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|x64.ActiveCfg = Debug|x64 + {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|x64.Build.0 = Debug|x64 {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|Win32.ActiveCfg = Release|Win32 {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|Win32.Build.0 = Release|Win32 + {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|x64.ActiveCfg = Release|x64 + {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|x64.Build.0 = Release|x64 {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|Win32.ActiveCfg = Debug|Win32 {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|Win32.Build.0 = Debug|Win32 + {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|x64.ActiveCfg = Debug|x64 + {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|x64.Build.0 = Debug|x64 {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|Win32.ActiveCfg = Release|Win32 {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|Win32.Build.0 = Release|Win32 + {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|x64.ActiveCfg = Release|x64 + {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|x64.Build.0 = Release|x64 {0E723473-FDBB-48D7-8141-1273B917D681}.Debug|Win32.ActiveCfg = Debug|Win32 {0E723473-FDBB-48D7-8141-1273B917D681}.Debug|Win32.Build.0 = Debug|Win32 + {0E723473-FDBB-48D7-8141-1273B917D681}.Debug|x64.ActiveCfg = Debug|x64 + {0E723473-FDBB-48D7-8141-1273B917D681}.Debug|x64.Build.0 = Debug|x64 {0E723473-FDBB-48D7-8141-1273B917D681}.Release|Win32.ActiveCfg = Release|Win32 {0E723473-FDBB-48D7-8141-1273B917D681}.Release|Win32.Build.0 = Release|Win32 + {0E723473-FDBB-48D7-8141-1273B917D681}.Release|x64.ActiveCfg = Release|x64 + {0E723473-FDBB-48D7-8141-1273B917D681}.Release|x64.Build.0 = Release|x64 {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.ActiveCfg = Debug|Win32 {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.Build.0 = Debug|Win32 + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.ActiveCfg = Debug|x64 + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.Build.0 = Debug|x64 {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.ActiveCfg = Release|Win32 {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.Build.0 = Release|Win32 + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.ActiveCfg = Release|x64 + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.Build.0 = Release|x64 {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.ActiveCfg = Debug|Win32 {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.Build.0 = Debug|Win32 + {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.ActiveCfg = Debug|x64 + {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.Build.0 = Debug|x64 {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.ActiveCfg = Release|Win32 {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.Build.0 = Release|Win32 + {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.ActiveCfg = Release|x64 + {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.Build.0 = Release|x64 {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|Win32.ActiveCfg = Debug|Win32 {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|Win32.Build.0 = Debug|Win32 + {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|x64.ActiveCfg = Debug|x64 + {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|x64.Build.0 = Debug|x64 {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|Win32.ActiveCfg = Release|Win32 {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|Win32.Build.0 = Release|Win32 + {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|x64.ActiveCfg = Release|x64 + {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|x64.Build.0 = Release|x64 {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|Win32.ActiveCfg = Debug|Win32 {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|Win32.Build.0 = Debug|Win32 + {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|x64.ActiveCfg = Debug|x64 + {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|x64.Build.0 = Debug|x64 {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|Win32.ActiveCfg = Release|Win32 {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|Win32.Build.0 = Release|Win32 + {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|x64.ActiveCfg = Release|x64 + {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|x64.Build.0 = Release|x64 {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|Win32.ActiveCfg = Debug|Win32 {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|Win32.Build.0 = Debug|Win32 + {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|x64.ActiveCfg = Debug|x64 + {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|x64.Build.0 = Debug|x64 {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|Win32.ActiveCfg = Release|Win32 {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|Win32.Build.0 = Release|Win32 + {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|x64.ActiveCfg = Release|x64 + {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|x64.Build.0 = Release|x64 {9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|Win32.ActiveCfg = Debug|Win32 {9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|Win32.Build.0 = Debug|Win32 + {9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|x64.ActiveCfg = Debug|x64 + {9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|x64.Build.0 = Debug|x64 {9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|Win32.ActiveCfg = Release|Win32 {9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|Win32.Build.0 = Release|Win32 + {9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|x64.ActiveCfg = Release|x64 + {9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|x64.Build.0 = Release|x64 {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|Win32.ActiveCfg = Debug|Win32 {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|Win32.Build.0 = Debug|Win32 + {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|x64.ActiveCfg = Debug|x64 + {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|x64.Build.0 = Debug|x64 {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|Win32.ActiveCfg = Release|Win32 {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|Win32.Build.0 = Release|Win32 + {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|x64.ActiveCfg = Release|x64 + {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|x64.Build.0 = Release|x64 {23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Debug|Win32.ActiveCfg = Debug|Win32 {23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Debug|Win32.Build.0 = Debug|Win32 + {23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Debug|x64.ActiveCfg = Debug|x64 + {23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Debug|x64.Build.0 = Debug|x64 {23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Release|Win32.ActiveCfg = Release|Win32 {23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Release|Win32.Build.0 = Release|Win32 + {23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Release|x64.ActiveCfg = Release|x64 + {23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/code/ryzom/tools/all.sln b/code/ryzom/tools/all.sln index 62531c5e0..bdd0ed0d8 100644 --- a/code/ryzom/tools/all.sln +++ b/code/ryzom/tools/all.sln @@ -166,125 +166,243 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.ActiveCfg = Debug|Win32 {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.Build.0 = Debug|Win32 + {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|x64.ActiveCfg = Debug|x64 + {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|x64.Build.0 = Debug|x64 {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|Win32.ActiveCfg = Release|Win32 {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|Win32.Build.0 = Release|Win32 + {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.ActiveCfg = Release|x64 + {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.Build.0 = Release|x64 {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.ActiveCfg = Debug|Win32 {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.Build.0 = Debug|Win32 + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.ActiveCfg = Debug|x64 + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.Build.0 = Debug|x64 {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.ActiveCfg = Release|Win32 {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.Build.0 = Release|Win32 + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.ActiveCfg = Release|x64 + {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.Build.0 = Release|x64 {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|Win32.ActiveCfg = Debug|Win32 {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|Win32.Build.0 = Debug|Win32 + {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|x64.ActiveCfg = Debug|x64 + {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|x64.Build.0 = Debug|x64 {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|Win32.ActiveCfg = Release|Win32 {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|Win32.Build.0 = Release|Win32 + {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|x64.ActiveCfg = Release|x64 + {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|x64.Build.0 = Release|x64 {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|Win32.ActiveCfg = Debug|Win32 {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|Win32.Build.0 = Debug|Win32 + {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|x64.ActiveCfg = Debug|x64 + {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|x64.Build.0 = Debug|x64 {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|Win32.ActiveCfg = Release|Win32 {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|Win32.Build.0 = Release|Win32 + {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|x64.ActiveCfg = Release|x64 + {C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|x64.Build.0 = Release|x64 {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|Win32.ActiveCfg = Debug|Win32 {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|Win32.Build.0 = Debug|Win32 + {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|x64.ActiveCfg = Debug|x64 + {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|x64.Build.0 = Debug|x64 {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|Win32.ActiveCfg = Release|Win32 {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|Win32.Build.0 = Release|Win32 + {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|x64.ActiveCfg = Release|x64 + {9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|x64.Build.0 = Release|x64 {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|Win32.ActiveCfg = Debug|Win32 {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|Win32.Build.0 = Debug|Win32 + {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|x64.ActiveCfg = Debug|x64 + {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|x64.Build.0 = Debug|x64 {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|Win32.ActiveCfg = Release|Win32 {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|Win32.Build.0 = Release|Win32 + {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|x64.ActiveCfg = Release|x64 + {4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|x64.Build.0 = Release|x64 {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|Win32.ActiveCfg = Debug|Win32 {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|Win32.Build.0 = Debug|Win32 + {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|x64.ActiveCfg = Debug|x64 + {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|x64.Build.0 = Debug|x64 {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|Win32.ActiveCfg = Release|Win32 {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|Win32.Build.0 = Release|Win32 + {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|x64.ActiveCfg = Release|x64 + {89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|x64.Build.0 = Release|x64 {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|Win32.ActiveCfg = Debug|Win32 {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|Win32.Build.0 = Debug|Win32 + {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|x64.ActiveCfg = Debug|x64 + {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|x64.Build.0 = Debug|x64 {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|Win32.ActiveCfg = Release|Win32 {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|Win32.Build.0 = Release|Win32 + {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|x64.ActiveCfg = Release|x64 + {1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|x64.Build.0 = Release|x64 {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.ActiveCfg = Debug|Win32 {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.Build.0 = Debug|Win32 + {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.ActiveCfg = Debug|x64 + {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.Build.0 = Debug|x64 {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.ActiveCfg = Release|Win32 {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.Build.0 = Release|Win32 + {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.ActiveCfg = Release|x64 + {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.Build.0 = Release|x64 {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|Win32.ActiveCfg = Debug|Win32 {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|Win32.Build.0 = Debug|Win32 + {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|x64.ActiveCfg = Debug|x64 + {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|x64.Build.0 = Debug|x64 {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|Win32.ActiveCfg = Release|Win32 {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|Win32.Build.0 = Release|Win32 + {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|x64.ActiveCfg = Release|x64 + {46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|x64.Build.0 = Release|x64 {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|Win32.ActiveCfg = Debug|Win32 {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|Win32.Build.0 = Debug|Win32 + {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|x64.ActiveCfg = Debug|x64 + {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|x64.Build.0 = Debug|x64 {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|Win32.ActiveCfg = Release|Win32 {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|Win32.Build.0 = Release|Win32 + {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|x64.ActiveCfg = Release|x64 + {263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|x64.Build.0 = Release|x64 {9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|Win32.ActiveCfg = Debug|Win32 {9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|Win32.Build.0 = Debug|Win32 + {9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|x64.ActiveCfg = Debug|x64 + {9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|x64.Build.0 = Debug|x64 {9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|Win32.ActiveCfg = Release|Win32 {9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|Win32.Build.0 = Release|Win32 + {9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|x64.ActiveCfg = Release|x64 + {9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|x64.Build.0 = Release|x64 {F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Debug|Win32.ActiveCfg = Debug|Win32 {F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Debug|Win32.Build.0 = Debug|Win32 + {F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Debug|x64.ActiveCfg = Debug|x64 + {F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Debug|x64.Build.0 = Debug|x64 {F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Release|Win32.ActiveCfg = Release|Win32 {F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Release|Win32.Build.0 = Release|Win32 + {F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Release|x64.ActiveCfg = Release|x64 + {F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Release|x64.Build.0 = Release|x64 {F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Debug|Win32.ActiveCfg = Debug|Win32 {F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Debug|Win32.Build.0 = Debug|Win32 + {F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Debug|x64.ActiveCfg = Debug|x64 + {F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Debug|x64.Build.0 = Debug|x64 {F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Release|Win32.ActiveCfg = Release|Win32 {F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Release|Win32.Build.0 = Release|Win32 + {F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Release|x64.ActiveCfg = Release|x64 + {F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Release|x64.Build.0 = Release|x64 {AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Debug|Win32.ActiveCfg = Debug|Win32 {AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Debug|Win32.Build.0 = Debug|Win32 + {AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Debug|x64.ActiveCfg = Debug|x64 + {AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Debug|x64.Build.0 = Debug|x64 {AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Release|Win32.ActiveCfg = Release|Win32 {AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Release|Win32.Build.0 = Release|Win32 + {AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Release|x64.ActiveCfg = Release|x64 + {AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Release|x64.Build.0 = Release|x64 {38A8CF85-4F48-4420-84D6-CC1E764C6291}.Debug|Win32.ActiveCfg = Debug|Win32 {38A8CF85-4F48-4420-84D6-CC1E764C6291}.Debug|Win32.Build.0 = Debug|Win32 + {38A8CF85-4F48-4420-84D6-CC1E764C6291}.Debug|x64.ActiveCfg = Debug|x64 + {38A8CF85-4F48-4420-84D6-CC1E764C6291}.Debug|x64.Build.0 = Debug|x64 {38A8CF85-4F48-4420-84D6-CC1E764C6291}.Release|Win32.ActiveCfg = Release|Win32 {38A8CF85-4F48-4420-84D6-CC1E764C6291}.Release|Win32.Build.0 = Release|Win32 + {38A8CF85-4F48-4420-84D6-CC1E764C6291}.Release|x64.ActiveCfg = Release|x64 + {38A8CF85-4F48-4420-84D6-CC1E764C6291}.Release|x64.Build.0 = Release|x64 {6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Debug|Win32.ActiveCfg = Debug|Win32 {6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Debug|Win32.Build.0 = Debug|Win32 + {6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Debug|x64.ActiveCfg = Debug|x64 + {6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Debug|x64.Build.0 = Debug|x64 {6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Release|Win32.ActiveCfg = Release|Win32 {6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Release|Win32.Build.0 = Release|Win32 + {6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Release|x64.ActiveCfg = Release|x64 + {6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Release|x64.Build.0 = Release|x64 {4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Debug|Win32.ActiveCfg = Debug|Win32 {4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Debug|Win32.Build.0 = Debug|Win32 + {4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Debug|x64.ActiveCfg = Debug|x64 + {4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Debug|x64.Build.0 = Debug|x64 {4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Release|Win32.ActiveCfg = Release|Win32 {4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Release|Win32.Build.0 = Release|Win32 + {4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Release|x64.ActiveCfg = Release|x64 + {4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Release|x64.Build.0 = Release|x64 {565DA67F-C546-415B-9256-F4046866B59C}.Debug|Win32.ActiveCfg = Debug|Win32 {565DA67F-C546-415B-9256-F4046866B59C}.Debug|Win32.Build.0 = Debug|Win32 + {565DA67F-C546-415B-9256-F4046866B59C}.Debug|x64.ActiveCfg = Debug|x64 + {565DA67F-C546-415B-9256-F4046866B59C}.Debug|x64.Build.0 = Debug|x64 {565DA67F-C546-415B-9256-F4046866B59C}.Release|Win32.ActiveCfg = Release|Win32 {565DA67F-C546-415B-9256-F4046866B59C}.Release|Win32.Build.0 = Release|Win32 + {565DA67F-C546-415B-9256-F4046866B59C}.Release|x64.ActiveCfg = Release|x64 + {565DA67F-C546-415B-9256-F4046866B59C}.Release|x64.Build.0 = Release|x64 {CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Debug|Win32.ActiveCfg = Debug|Win32 {CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Debug|Win32.Build.0 = Debug|Win32 + {CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Debug|x64.ActiveCfg = Debug|x64 + {CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Debug|x64.Build.0 = Debug|x64 {CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Release|Win32.ActiveCfg = Release|Win32 {CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Release|Win32.Build.0 = Release|Win32 + {CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Release|x64.ActiveCfg = Release|x64 + {CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Release|x64.Build.0 = Release|x64 {B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Debug|Win32.ActiveCfg = Debug|Win32 {B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Debug|Win32.Build.0 = Debug|Win32 + {B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Debug|x64.ActiveCfg = Debug|x64 + {B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Debug|x64.Build.0 = Debug|x64 {B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Release|Win32.ActiveCfg = Release|Win32 {B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Release|Win32.Build.0 = Release|Win32 + {B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Release|x64.ActiveCfg = Release|x64 + {B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Release|x64.Build.0 = Release|x64 {358403E3-B05D-4793-A87B-BA2FF7AB122D}.Debug|Win32.ActiveCfg = Debug|Win32 {358403E3-B05D-4793-A87B-BA2FF7AB122D}.Debug|Win32.Build.0 = Debug|Win32 + {358403E3-B05D-4793-A87B-BA2FF7AB122D}.Debug|x64.ActiveCfg = Debug|x64 + {358403E3-B05D-4793-A87B-BA2FF7AB122D}.Debug|x64.Build.0 = Debug|x64 {358403E3-B05D-4793-A87B-BA2FF7AB122D}.Release|Win32.ActiveCfg = Release|Win32 {358403E3-B05D-4793-A87B-BA2FF7AB122D}.Release|Win32.Build.0 = Release|Win32 + {358403E3-B05D-4793-A87B-BA2FF7AB122D}.Release|x64.ActiveCfg = Release|x64 + {358403E3-B05D-4793-A87B-BA2FF7AB122D}.Release|x64.Build.0 = Release|x64 {F27E79A2-9B78-4497-A829-FD3D80B8E861}.Debug|Win32.ActiveCfg = Debug|Win32 {F27E79A2-9B78-4497-A829-FD3D80B8E861}.Debug|Win32.Build.0 = Debug|Win32 + {F27E79A2-9B78-4497-A829-FD3D80B8E861}.Debug|x64.ActiveCfg = Debug|x64 + {F27E79A2-9B78-4497-A829-FD3D80B8E861}.Debug|x64.Build.0 = Debug|x64 {F27E79A2-9B78-4497-A829-FD3D80B8E861}.Release|Win32.ActiveCfg = Release|Win32 {F27E79A2-9B78-4497-A829-FD3D80B8E861}.Release|Win32.Build.0 = Release|Win32 + {F27E79A2-9B78-4497-A829-FD3D80B8E861}.Release|x64.ActiveCfg = Release|x64 + {F27E79A2-9B78-4497-A829-FD3D80B8E861}.Release|x64.Build.0 = Release|x64 {296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Debug|Win32.ActiveCfg = Debug|Win32 {296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Debug|Win32.Build.0 = Debug|Win32 + {296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Debug|x64.ActiveCfg = Debug|x64 + {296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Debug|x64.Build.0 = Debug|x64 {296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Release|Win32.ActiveCfg = Release|Win32 {296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Release|Win32.Build.0 = Release|Win32 + {296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Release|x64.ActiveCfg = Release|x64 + {296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Release|x64.Build.0 = Release|x64 {079E2366-3714-4B09-B553-41A44D290F04}.Debug|Win32.ActiveCfg = Debug|Win32 {079E2366-3714-4B09-B553-41A44D290F04}.Debug|Win32.Build.0 = Debug|Win32 + {079E2366-3714-4B09-B553-41A44D290F04}.Debug|x64.ActiveCfg = Debug|x64 + {079E2366-3714-4B09-B553-41A44D290F04}.Debug|x64.Build.0 = Debug|x64 {079E2366-3714-4B09-B553-41A44D290F04}.Release|Win32.ActiveCfg = Release|Win32 {079E2366-3714-4B09-B553-41A44D290F04}.Release|Win32.Build.0 = Release|Win32 + {079E2366-3714-4B09-B553-41A44D290F04}.Release|x64.ActiveCfg = Release|x64 + {079E2366-3714-4B09-B553-41A44D290F04}.Release|x64.Build.0 = Release|x64 {CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Debug|Win32.ActiveCfg = Debug|Win32 {CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Debug|Win32.Build.0 = Debug|Win32 + {CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Debug|x64.ActiveCfg = Debug|x64 + {CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Debug|x64.Build.0 = Debug|x64 {CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Release|Win32.ActiveCfg = Release|Win32 {CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Release|Win32.Build.0 = Release|Win32 + {CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Release|x64.ActiveCfg = Release|x64 + {CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Release|x64.Build.0 = Release|x64 {DAB4B616-E628-433E-92CA-AFAB614A1656}.Debug|Win32.ActiveCfg = Debug|Win32 {DAB4B616-E628-433E-92CA-AFAB614A1656}.Debug|Win32.Build.0 = Debug|Win32 + {DAB4B616-E628-433E-92CA-AFAB614A1656}.Debug|x64.ActiveCfg = Debug|x64 + {DAB4B616-E628-433E-92CA-AFAB614A1656}.Debug|x64.Build.0 = Debug|x64 {DAB4B616-E628-433E-92CA-AFAB614A1656}.Release|Win32.ActiveCfg = Release|Win32 {DAB4B616-E628-433E-92CA-AFAB614A1656}.Release|Win32.Build.0 = Release|Win32 + {DAB4B616-E628-433E-92CA-AFAB614A1656}.Release|x64.ActiveCfg = Release|x64 + {DAB4B616-E628-433E-92CA-AFAB614A1656}.Release|x64.Build.0 = Release|x64 {3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Debug|Win32.ActiveCfg = Debug|Win32 {3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Debug|Win32.Build.0 = Debug|Win32 + {3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Debug|x64.ActiveCfg = Debug|x64 + {3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Debug|x64.Build.0 = Debug|x64 {3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Release|Win32.ActiveCfg = Release|Win32 {3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Release|Win32.Build.0 = Release|Win32 + {3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Release|x64.ActiveCfg = Release|x64 + {3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Release|x64.Build.0 = Release|x64 {FA681701-91A3-44D7-878B-92E3B3BCBE43}.Debug|Win32.ActiveCfg = Debug|Win32 {FA681701-91A3-44D7-878B-92E3B3BCBE43}.Debug|Win32.Build.0 = Debug|Win32 + {FA681701-91A3-44D7-878B-92E3B3BCBE43}.Debug|x64.ActiveCfg = Debug|x64 + {FA681701-91A3-44D7-878B-92E3B3BCBE43}.Debug|x64.Build.0 = Debug|x64 {FA681701-91A3-44D7-878B-92E3B3BCBE43}.Release|Win32.ActiveCfg = Release|Win32 {FA681701-91A3-44D7-878B-92E3B3BCBE43}.Release|Win32.Build.0 = Release|Win32 + {FA681701-91A3-44D7-878B-92E3B3BCBE43}.Release|x64.ActiveCfg = Release|x64 + {FA681701-91A3-44D7-878B-92E3B3BCBE43}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/code/ryzom/tools/leveldesign/csv_transform/csv_transform.vcproj b/code/ryzom/tools/leveldesign/csv_transform/csv_transform.vcproj index d3e42acdc..f58c5db8d 100644 --- a/code/ryzom/tools/leveldesign/csv_transform/csv_transform.vcproj +++ b/code/ryzom/tools/leveldesign/csv_transform/csv_transform.vcproj @@ -1,7 +1,7 @@ + @@ -35,6 +38,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -193,6 +362,14 @@ Name="VCCustomBuildTool" /> + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_dll.vcproj b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_dll.vcproj index 3dd82db86..82899302e 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_dll.vcproj +++ b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_dll.vcproj @@ -1,7 +1,7 @@ + @@ -180,6 +183,172 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -307,6 +476,22 @@ UsePrecompiledHeader="1" /> + + + + + + + @@ -175,6 +178,168 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.vcproj b/code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.vcproj index 6c6d54fa0..43f8f40c8 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.vcproj +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.vcproj @@ -1,7 +1,7 @@ + @@ -177,6 +180,170 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.vcproj b/code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.vcproj index b10e551b6..3b9a02f9c 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.vcproj +++ b/code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.vcproj @@ -1,7 +1,7 @@ + @@ -175,6 +178,168 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -226,6 +391,22 @@ UsePrecompiledHeader="1" /> + + + + + + + @@ -148,6 +151,142 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/tools/leveldesign/uni_conv/uni_conv.vcproj b/code/ryzom/tools/leveldesign/uni_conv/uni_conv.vcproj index 7ead6b405..3e6c9df48 100644 --- a/code/ryzom/tools/leveldesign/uni_conv/uni_conv.vcproj +++ b/code/ryzom/tools/leveldesign/uni_conv/uni_conv.vcproj @@ -1,7 +1,7 @@ + @@ -35,6 +38,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.vcproj b/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.vcproj index 3f81fa533..0c68d3099 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.vcproj +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.vcproj @@ -1,7 +1,7 @@ + @@ -178,6 +181,170 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -309,6 +476,22 @@ UsePrecompiledHeader="1" /> + + + + + + + @@ -179,6 +182,172 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,6 +387,22 @@ UsePrecompiledHeader="1" /> + + + + + + + @@ -179,6 +182,172 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -210,6 +379,22 @@ UsePrecompiledHeader="1" /> + + + + + + + @@ -177,6 +180,170 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.vcproj b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.vcproj index c651b5a5d..937375e2b 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.vcproj +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.vcproj @@ -1,7 +1,7 @@ + @@ -179,6 +182,172 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -230,6 +399,22 @@ UsePrecompiledHeader="1" /> + + + + + + + @@ -21,7 +22,6 @@ IntermediateDirectory="..\..\..\..\obj\$(ConfigurationName)\$(ProjectName)" ConfigurationType="2" UseOfMFC="2" - ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -222,6 +388,22 @@ UsePrecompiledHeader="1" /> + + + + + + + @@ -178,6 +181,171 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bfb37426396089dfe3a803b3f32d7caddf0c80d8 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 May 2010 20:37:23 +0200 Subject: [PATCH 3/7] Changed: #829 Make Ryzom client working with latest liblua, luabind, libwww --- code/ryzom/client/src/client.vcproj | 8 +- .../client/src/interface_v3/group_html.h | 30 +-- .../ryzom/client/src/interface_v3/lua_ihm.cpp | 232 +++++++++--------- 3 files changed, 139 insertions(+), 131 deletions(-) diff --git a/code/ryzom/client/src/client.vcproj b/code/ryzom/client/src/client.vcproj index 06817185c..5039a8dab 100644 --- a/code/ryzom/client/src/client.vcproj +++ b/code/ryzom/client/src/client.vcproj @@ -69,7 +69,7 @@ /> imgs; - }; - - std::vector Curls; - CURLM *MultiCurl; - int RunningCurls; + + // ImageDownload system + + struct CImageDownload + { + CImageDownload(CURL *c, const std::string &u, FILE *f, CViewBase *i) : curl(c), url(u), fp(f) { imgs.push_back(i); } + CURL *curl; + std::string url; + FILE *fp; + std::vector imgs; + }; + + std::vector Curls; + CURLM *MultiCurl; + int RunningCurls; void initImageDownload(); void releaseImageDownload(); diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.cpp b/code/ryzom/client/src/interface_v3/lua_ihm.cpp index c4bf447ff..59a6fdff3 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm.cpp @@ -131,6 +131,21 @@ std::ostream &operator<<(std::ostream &str, const ucstring &value) return str << value.toString(); } +struct CMiscFunctions +{ + static std::string fileLookup(const std::string &fileName) + { + return NLMISC::CPath::lookup(fileName, false); + } + static void shellExecute(const char *operation, const char *fileName, const char *parameters) + { + #if !FINAL_VERSION + #ifdef NL_OS_WINDOWS + ShellExecute(NULL, operation, fileName, parameters, NULL, SW_SHOWDEFAULT); + #endif + #endif + } +}; /** @@ -191,6 +206,7 @@ bool CLuaIHM::pop(CLuaState &ls, NLMISC::CRGBA &dest) if (ls.isNil(-1)) return false; #if LUABIND_VERSION == 07 luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1)); + ls.pop(); #else luabind::object obj(ls.getStatePointer()); obj.set(); @@ -213,6 +229,7 @@ bool CLuaIHM::pop(CLuaState &ls,NLMISC::CVector2f &dest) if (ls.isNil(-1)) return false; #if LUABIND_VERSION == 07 luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1)); + ls.pop(); #else luabind::object obj(ls.getStatePointer()); obj.set(); @@ -235,6 +252,7 @@ bool CLuaIHM::pop(CLuaState &ls, ucstring &dest) if (ls.isNil(-1)) return false; #if LUABIND_VERSION == 07 luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1)); + ls.pop(); #else luabind::object obj(ls.getStatePointer()); obj.set(); @@ -441,12 +459,12 @@ CLuaState * ELuaIHMException::getLuaState() // *************************************************************************** #define LUA_REGISTER_BASIC(_type_) \ -yes_t is_user_defined(by_value<_type_>); \ -_type_ convert_lua_to_cpp(lua_State* L, by_value<_type_>, int index) \ +luabind::detail::yes_t is_user_defined(luabind::detail::by_value<_type_>); \ +_type_ convert_lua_to_cpp(lua_State* L, luabind::detail::by_value<_type_>, int index) \ { \ return (_type_)lua_tonumber(L, index); \ } \ -int match_lua_to_cpp(lua_State* L, by_value<_type_>, int index) \ +int match_lua_to_cpp(lua_State* L, luabind::detail::by_value<_type_>, int index) \ { \ if (lua_isnumber(L, index)) return 0; else return -1; \ } \ @@ -1202,7 +1220,8 @@ void CLuaIHM::createLuaEnumTable(CLuaState &ls, const std::string &str) } \ // *************************************************************************** -#define LUABIND_FUNC(__func__) luabind::function(L, #__func__, &__func__); +#define LUABIND_FUNC(__func__) luabind::def(#__func__, &__func__) + void CLuaIHM::registerIHM(CLuaState &ls) { //H_AUTO(Lua_CLuaIHM_registerIHM) @@ -1323,89 +1342,101 @@ void CLuaIHM::registerIHM(CLuaState &ls) ls.registerFunc("getUserRace", getUserRace); // Through LUABind API lua_State *L= ls.getStatePointer(); - LUABIND_FUNC(getDbProp); - LUABIND_FUNC(setDbProp); - LUABIND_FUNC(debugInfo); - LUABIND_FUNC(rawDebugInfo); - LUABIND_FUNC(dumpCallStack); - LUABIND_FUNC(getDefine); - LUABIND_FUNC(setContextHelpText); - luabind::function(L, "messageBox", (void(*)(const ucstring &)) &messageBox); - luabind::function(L, "messageBox", (void(*)(const ucstring &, const std::string &)) &messageBox); - luabind::function(L, "messageBox", (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBox); - luabind::function(L, "messageBox", (void(*)(const std::string &)) &messageBox); - luabind::function(L, "messageBoxWithHelp", (void(*)(const ucstring &)) &messageBoxWithHelp); - luabind::function(L, "messageBoxWithHelp", (void(*)(const ucstring &, const std::string &)) &messageBoxWithHelp); - luabind::function(L, "messageBoxWithHelp", (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBoxWithHelp); - luabind::function(L, "messageBoxWithHelp", (void(*)(const std::string &)) &messageBoxWithHelp); - luabind::function(L, "findReplaceAll", (std::string(*)(const std::string &, const std::string &, const std::string &)) &findReplaceAll); - luabind::function(L, "findReplaceAll", (ucstring(*)(const ucstring &, const ucstring &, const ucstring &)) &findReplaceAll); - luabind::function(L, "findReplaceAll", (ucstring(*)(const ucstring &, const std::string &, const std::string &)) &findReplaceAll); - luabind::function(L, "findReplaceAll", (ucstring(*)(const ucstring &, const ucstring &, const std::string &)) &findReplaceAll); - luabind::function(L, "findReplaceAll", (ucstring(*)(const ucstring &, const std::string &, const ucstring &)) &findReplaceAll); - LUABIND_FUNC(getPlayerSelectedSlot) - LUABIND_FUNC(isInGame) - LUABIND_FUNC(pauseBGDownloader); - LUABIND_FUNC(unpauseBGDownloader); - LUABIND_FUNC(requestBGDownloaderPriority); - LUABIND_FUNC(getBGDownloaderPriority); - LUABIND_FUNC(getPatchLastErrorMessage); - LUABIND_FUNC(isPlayerSlotNewbieLand) - LUABIND_FUNC(getSkillIdFromName); - LUABIND_FUNC(getSkillLocalizedName); - LUABIND_FUNC(getMaxSkillValue); - LUABIND_FUNC(getBaseSkillValueMaxChildren); - LUABIND_FUNC(getMagicResistChance); - LUABIND_FUNC(getDodgeParryChance); - LUABIND_FUNC(browseNpcWebPage); - LUABIND_FUNC(clearHtmlUndoRedo); - LUABIND_FUNC(getDynString); - LUABIND_FUNC(isDynStringAvailable); - LUABIND_FUNC(isFullyPatched); - LUABIND_FUNC(getSheetType); - LUABIND_FUNC(getSheetName); - LUABIND_FUNC(getFameIndex); - LUABIND_FUNC(getFameName); - LUABIND_FUNC(getFameDBIndex); - LUABIND_FUNC(getFirstTribeFameIndex); - LUABIND_FUNC(getNbTribeFameIndex); - LUABIND_FUNC(getClientCfg); - LUABIND_FUNC(fileExists); - LUABIND_FUNC(sendMsgToServer); - LUABIND_FUNC(sendMsgToServerPvpTag); - LUABIND_FUNC(isGuildQuitAvailable); - LUABIND_FUNC(sortGuildMembers); - LUABIND_FUNC(getNbGuildMembers); - LUABIND_FUNC(getGuildMemberName); - LUABIND_FUNC(getGuildMemberGrade); - LUABIND_FUNC(isR2Player); - LUABIND_FUNC(getR2PlayerRace); - LUABIND_FUNC(isR2PlayerMale); - LUABIND_FUNC(getCharacterSheetSkel); - LUABIND_FUNC(getSheetId) - LUABIND_FUNC(getCharacterSheetRegionForce) - LUABIND_FUNC(getCharacterSheetRegionLevel) - LUABIND_FUNC(replacePvpEffectParam); - LUABIND_FUNC(getRegionByAlias); - LUABIND_FUNC(tell); - LUABIND_FUNC(isRingAccessPointInReach); - LUABIND_FUNC(updateTooltipCoords); - LUABIND_FUNC(secondsSince1970ToHour); - LUABIND_FUNC(isCtrlKeyDown); - LUABIND_FUNC(encodeURLUnicodeParam); - - LUABIND_ENUM(PVP_CLAN::TPVPClan, "game.TPVPClan", PVP_CLAN::NbClans, PVP_CLAN::toString) - LUABIND_ENUM(BONUS_MALUS::TBonusMalusSpecialTT, "game.TBonusMalusSpecialTT", BONUS_MALUS::NbSpecialTT, BONUS_MALUS::toString) - - LUABIND_FUNC(getPlayerLevel); - LUABIND_FUNC(getTargetLevel); - LUABIND_FUNC(getTargetForceRegion); - LUABIND_FUNC(getTargetLevelForce); - LUABIND_FUNC(isTargetNPC) - LUABIND_FUNC(isTargetPlayer) // return 'true' if the target is an npc - LUABIND_FUNC(isTargetUser) - LUABIND_FUNC(isPlayerInPVPMode) - LUABIND_FUNC(isTargetInPVPMode) + + luabind::module(L) + [ + LUABIND_FUNC(getDbProp), + LUABIND_FUNC(setDbProp), + LUABIND_FUNC(debugInfo), + LUABIND_FUNC(rawDebugInfo), + LUABIND_FUNC(dumpCallStack), + LUABIND_FUNC(getDefine), + LUABIND_FUNC(setContextHelpText), + luabind::def("messageBox", (void(*)(const ucstring &)) &messageBox), + luabind::def("messageBox", (void(*)(const ucstring &, const std::string &)) &messageBox), + luabind::def("messageBox", (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBox), + luabind::def("messageBox", (void(*)(const std::string &)) &messageBox), + luabind::def("messageBoxWithHelp", (void(*)(const ucstring &)) &messageBoxWithHelp), + luabind::def("messageBoxWithHelp", (void(*)(const ucstring &, const std::string &)) &messageBoxWithHelp), + luabind::def("messageBoxWithHelp", (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBoxWithHelp), + luabind::def("messageBoxWithHelp", (void(*)(const std::string &)) &messageBoxWithHelp), + luabind::def("findReplaceAll", (std::string(*)(const std::string &, const std::string &, const std::string &)) &findReplaceAll), + luabind::def("findReplaceAll", (ucstring(*)(const ucstring &, const ucstring &, const ucstring &)) &findReplaceAll), + luabind::def("findReplaceAll", (ucstring(*)(const ucstring &, const std::string &, const std::string &)) &findReplaceAll), + luabind::def("findReplaceAll", (ucstring(*)(const ucstring &, const ucstring &, const std::string &)) &findReplaceAll), + luabind::def("findReplaceAll", (ucstring(*)(const ucstring &, const std::string &, const ucstring &)) &findReplaceAll), + LUABIND_FUNC(getPlayerSelectedSlot), + LUABIND_FUNC(isInGame), + LUABIND_FUNC(pauseBGDownloader), + LUABIND_FUNC(unpauseBGDownloader), + LUABIND_FUNC(requestBGDownloaderPriority), + LUABIND_FUNC(getBGDownloaderPriority), + LUABIND_FUNC(getPatchLastErrorMessage), + LUABIND_FUNC(isPlayerSlotNewbieLand), + LUABIND_FUNC(getSkillIdFromName), + LUABIND_FUNC(getSkillLocalizedName), + LUABIND_FUNC(getMaxSkillValue), + LUABIND_FUNC(getBaseSkillValueMaxChildren), + LUABIND_FUNC(getMagicResistChance), + LUABIND_FUNC(getDodgeParryChance), + LUABIND_FUNC(browseNpcWebPage), + LUABIND_FUNC(clearHtmlUndoRedo), + LUABIND_FUNC(getDynString), + LUABIND_FUNC(isDynStringAvailable), + LUABIND_FUNC(isFullyPatched), + LUABIND_FUNC(getSheetType), + LUABIND_FUNC(getSheetName), + LUABIND_FUNC(getFameIndex), + LUABIND_FUNC(getFameName), + LUABIND_FUNC(getFameDBIndex), + LUABIND_FUNC(getFirstTribeFameIndex), + LUABIND_FUNC(getNbTribeFameIndex), + LUABIND_FUNC(getClientCfg), + LUABIND_FUNC(fileExists), + LUABIND_FUNC(sendMsgToServer), + LUABIND_FUNC(sendMsgToServerPvpTag), + LUABIND_FUNC(isGuildQuitAvailable), + LUABIND_FUNC(sortGuildMembers), + LUABIND_FUNC(getNbGuildMembers), + LUABIND_FUNC(getGuildMemberName), + LUABIND_FUNC(getGuildMemberGrade), + LUABIND_FUNC(isR2Player), + LUABIND_FUNC(getR2PlayerRace), + LUABIND_FUNC(isR2PlayerMale), + LUABIND_FUNC(getCharacterSheetSkel), + LUABIND_FUNC(getSheetId), + LUABIND_FUNC(getCharacterSheetRegionForce), + LUABIND_FUNC(getCharacterSheetRegionLevel), + LUABIND_FUNC(replacePvpEffectParam), + LUABIND_FUNC(getRegionByAlias), + LUABIND_FUNC(tell), + LUABIND_FUNC(isRingAccessPointInReach), + LUABIND_FUNC(updateTooltipCoords), + LUABIND_FUNC(secondsSince1970ToHour), + LUABIND_FUNC(isCtrlKeyDown), + LUABIND_FUNC(encodeURLUnicodeParam), + + #if !FINAL_VERSION + LUABIND_FUNC(openDoc), + LUABIND_FUNC(launchProgram), + #endif + + luabind::def("fileLookup", CMiscFunctions::fileLookup), + luabind::def("shellExecute", CMiscFunctions::shellExecute), + + LUABIND_FUNC(getPlayerLevel), + LUABIND_FUNC(getTargetLevel), + LUABIND_FUNC(getTargetForceRegion), + LUABIND_FUNC(getTargetLevelForce), + LUABIND_FUNC(isTargetNPC), + LUABIND_FUNC(isTargetPlayer), // return 'true' if the target is an npc + LUABIND_FUNC(isTargetUser), + LUABIND_FUNC(isPlayerInPVPMode), + LUABIND_FUNC(isTargetInPVPMode) + ]; + + LUABIND_ENUM(PVP_CLAN::TPVPClan, "game.TPVPClan", PVP_CLAN::NbClans, PVP_CLAN::toString); + LUABIND_ENUM(BONUS_MALUS::TBonusMalusSpecialTT, "game.TBonusMalusSpecialTT", BONUS_MALUS::NbSpecialTT, BONUS_MALUS::toString); // inside i18n table luabind::module(L, "i18n") @@ -1428,31 +1459,6 @@ void CLuaIHM::registerIHM(CLuaState &ls) luabind::def("getLocalTime", getLocalTime) // NB : use CLuaIHM::getLocalTime instead of NLMISC::CTime::getLocalTime, because the NLMISC // version returns a uint64, which can't be casted into lua numbers (doubles ...) ]; - - - - #if !FINAL_VERSION - LUABIND_FUNC(openDoc) - LUABIND_FUNC(launchProgram) - #endif - - #ifdef NL_OS_WINDOWS - struct CMiscFunctions - { - static std::string fileLookup(const std::string &fileName) - { - return NLMISC::CPath::lookup(fileName, false); - } - static void shellExecute(const char *operation, const char *fileName, const char *parameters) - { - #if !FINAL_VERSION - ShellExecute(NULL, operation, fileName, parameters, NULL, SW_SHOWDEFAULT); - #endif - } - }; - luabind::function(L, "fileLookup", CMiscFunctions::fileLookup); - luabind::function(L, "shellExecute", CMiscFunctions::shellExecute); - #endif } @@ -3317,6 +3323,7 @@ bool CLuaIHM::popString(CLuaState &ls, std::string & dest) { #if LUABIND_VERSION == 07 luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1)); + ls.pop(); #else luabind::object obj(ls.getStatePointer()); obj.set(); @@ -3338,6 +3345,7 @@ bool CLuaIHM::popSINT32(CLuaState &ls, sint32 & dest) { #if LUABIND_VERSION == 07 luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1)); + ls.pop(); #else luabind::object obj(ls.getStatePointer()); obj.set(); From e41e144d99e9e33984e8ac5d25acf07662f43ddd Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 May 2010 20:37:41 +0200 Subject: [PATCH 4/7] Changed: #869 Crash when updating Windows 7 progress bar --- code/ryzom/client/src/progress.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/src/progress.cpp b/code/ryzom/client/src/progress.cpp index 9f7f8a3b9..72274785f 100644 --- a/code/ryzom/client/src/progress.cpp +++ b/code/ryzom/client/src/progress.cpp @@ -68,7 +68,7 @@ CProgress::CProgress () HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); // instanciate the taskbar control COM object - if (SUCCEEDED(hr)) CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pTaskbarList)); +// if (SUCCEEDED(hr)) CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pTaskbarList)); #endif // TASKBAR_PROGRESS } From 307208ccb69e85d0092160858d32f69c1b62665c Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 May 2010 21:14:44 +0200 Subject: [PATCH 5/7] Changed: #825 Remove all warning when compiling Ryzom on Linux --- code/ryzom/client/src/libwww.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/src/libwww.cpp b/code/ryzom/client/src/libwww.cpp index aa95339a4..5e55d933e 100644 --- a/code/ryzom/client/src/libwww.cpp +++ b/code/ryzom/client/src/libwww.cpp @@ -586,7 +586,7 @@ void initLibWWW() /* Register the default set of MIME header parsers */ struct { - char * string; + const char * string; HTParserCallback * pHandler; } fixedHandlers[] = { {"accept", &HTMIME_accept}, From a61aa6616b9a6573b01c3e294936cd17cf9d2342 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 May 2010 21:49:30 +0200 Subject: [PATCH 6/7] Fixed: #875 Add possibility to change default audio driver --- code/ryzom/client/src/client_cfg.cpp | 12 ++++-------- code/ryzom/client/src/client_cfg.h | 2 +- code/ryzom/client/src/sound_manager.cpp | 6 ++++++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index c7364dc69..36b197a52 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -382,9 +382,7 @@ CClientConfig::CClientConfig() /////////// // SOUND // SoundOn = true; // Default is with sound. - // hulud patch force fmod - // DriverSound = SoundDrvAuto; - DriverSound = SoundDrvFMod; + DriverSound = SoundDrvAuto; SoundForceSoftwareBuffer = true; SoundOutGameMusic = "Main Menu Loop.ogg"; SoundSFXVolume = 1.f; @@ -1119,19 +1117,17 @@ void CClientConfig::setValues() // SoundOn READ_BOOL_FV(SoundOn) // Sound Driver -#if !FINAL_VERSION varPtr = ClientCfg.ConfigFile.getVarPtr ("DriverSound"); if (varPtr) { - /* hulud patch force fmod if (nlstricmp(varPtr->asString(), "Auto") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvAuto; else if (nlstricmp(varPtr->asString(), "FMod") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvFMod; - */ - ClientCfg.DriverSound = CClientConfig::SoundDrvFMod; + else if (nlstricmp(varPtr->asString(), "OpenAL") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvOpenAL; + else if (nlstricmp(varPtr->asString(), "DirectSound") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvDirectSound; + else if (nlstricmp(varPtr->asString(), "XAudio2") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvXAudio2; } else cfgWarning ("Default value used for 'DriverSound' !!!"); -#endif // FINAL_VERSION // SoundForceSoftwareBuffer READ_BOOL_FV(SoundForceSoftwareBuffer); // SoundOutGameMusic diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h index 1670524ab..196374712 100644 --- a/code/ryzom/client/src/client_cfg.h +++ b/code/ryzom/client/src/client_cfg.h @@ -49,7 +49,7 @@ using std::string; struct CClientConfig { enum TDriver3D { DrvAuto = 0, OpenGL, Direct3D }; - enum TDriverSound { SoundDrvAuto = 0, SoundDrvFMod }; + enum TDriverSound { SoundDrvAuto = 0, SoundDrvFMod, SoundDrvOpenAL, SoundDrvDirectSound, SoundDrvXAudio2 }; enum TStageLCTUsage { StageUseNoLCT = 0, StageUseAllLCT, StageUsePosOnlyLCT }; // the config file must be always be available diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp index d2532ccae..972731371 100644 --- a/code/ryzom/client/src/sound_manager.cpp +++ b/code/ryzom/client/src/sound_manager.cpp @@ -464,6 +464,12 @@ void CSoundManager::init(IProgressCallback *progressCallBack) UAudioMixer::TDriver driverType= UAudioMixer::DriverAuto; if(ClientCfg.DriverSound==CClientConfig::SoundDrvFMod) driverType= UAudioMixer::DriverFMod; + else if(ClientCfg.DriverSound==CClientConfig::SoundDrvOpenAL) + driverType= UAudioMixer::DriverOpenAl; + else if(ClientCfg.DriverSound==CClientConfig::SoundDrvDirectSound) + driverType= UAudioMixer::DriverDSound; + else if(ClientCfg.DriverSound==CClientConfig::SoundDrvXAudio2) + driverType= UAudioMixer::DriverXAudio2; _AudioMixer->init(ClientCfg.MaxTrack, ClientCfg.UseEax, ClientCfg.UseADPCM, progressCallBack, false, driverType, ClientCfg.SoundForceSoftwareBuffer); /* int nbVoice = _AudioMixer->getPolyphony(); _AudioMixer->setPriorityReserve(HighPri, max(1, nbVoice /2)); From ad487dae191b772df7db95bd08907301b9e02769 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 May 2010 22:04:05 +0200 Subject: [PATCH 7/7] Changed: #860 Remove/convert/update old projects --- .../nel_launcher.dsp | 189 -- .../nel_launcher.dsw | 59 - .../nel_launcher.vcproj | 445 ++++ code/ryzom/tools/leveldesign/LevelDesign.dsw | 503 ----- .../georges_plugin_test.dsp | 154 -- .../georges_plugin_test.vcproj | 645 ++++++ .../ryzom/tools/leveldesign/master/master.dsp | 325 --- .../ryzom/tools/leveldesign/master/master.dsw | 137 -- .../tools/leveldesign/master/master.vcproj | 1923 +++++++++++++++++ 9 files changed, 3013 insertions(+), 1367 deletions(-) delete mode 100644 code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsp delete mode 100644 code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsw create mode 100644 code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.vcproj delete mode 100644 code/ryzom/tools/leveldesign/LevelDesign.dsw delete mode 100644 code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.dsp create mode 100644 code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.vcproj delete mode 100644 code/ryzom/tools/leveldesign/master/master.dsp delete mode 100644 code/ryzom/tools/leveldesign/master/master.dsw create mode 100644 code/ryzom/tools/leveldesign/master/master.vcproj diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsp b/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsp deleted file mode 100644 index f522d208b..000000000 --- a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsp +++ /dev/null @@ -1,189 +0,0 @@ -# Microsoft Developer Studio Project File - Name="nel_launcher" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=nel_launcher - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "nel_launcher.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nel_launcher.mak" CFG="nel_launcher - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nel_launcher - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "nel_launcher - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "nel_launcher - Win32 ReleaseDebug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nel_launcher - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"std_afx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"std_afx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 curllib_static.lib libcurl.lib zlib.lib wininet.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "nel_launcher - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"std_afx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "__STL_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_DEBUG" /D "WIN32" /D "_MBCS" /Yu"std_afx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x40c /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 curllib_static.lib zlib.lib wininet.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ELSEIF "$(CFG)" == "nel_launcher - Win32 ReleaseDebug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "nel_launcher___Win32_ReleaseDebug" -# PROP BASE Intermediate_Dir "nel_launcher___Win32_ReleaseDebug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDebug" -# PROP Intermediate_Dir "ReleaseDebug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"std_afx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /D "NL_RELEASE_DEBUG" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "_MBCS" /Yu"std_afx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 curllib_static.lib zlib.lib wininet.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "nel_launcher - Win32 Release" -# Name "nel_launcher - Win32 Debug" -# Name "nel_launcher - Win32 ReleaseDebug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\connection.cpp -# End Source File -# Begin Source File - -SOURCE=.\nel_launcher.cpp -# End Source File -# Begin Source File - -SOURCE=.\nel_launcher.rc -# End Source File -# Begin Source File - -SOURCE=.\nel_launcher_dlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\patch.cpp -# End Source File -# Begin Source File - -SOURCE=.\std_afx.cpp -# ADD CPP /Yc"std_afx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\connection.h -# End Source File -# Begin Source File - -SOURCE=.\nel_launcher.h -# End Source File -# Begin Source File - -SOURCE=.\nel_launcher_dlg.h -# End Source File -# Begin Source File - -SOURCE=.\patch.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\std_afx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\nel_launcher.ico -# End Source File -# Begin Source File - -SOURCE=.\res\nel_launcher.rc2 -# End Source File -# End Group -# End Target -# End Project diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsw b/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsw deleted file mode 100644 index 47e866a5e..000000000 --- a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsw +++ /dev/null @@ -1,59 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "misc"=..\..\..\nel\src\misc.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "nel_launcher"=.\nel_launcher.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name net - End Project Dependency -}}} - -############################################################################### - -Project: "net"=..\..\..\nel\src\net.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.vcproj b/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.vcproj new file mode 100644 index 000000000..b1bbab8ac --- /dev/null +++ b/code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.vcproj @@ -0,0 +1,445 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/tools/leveldesign/LevelDesign.dsw b/code/ryzom/tools/leveldesign/LevelDesign.dsw deleted file mode 100644 index 079da64e2..000000000 --- a/code/ryzom/tools/leveldesign/LevelDesign.dsw +++ /dev/null @@ -1,503 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "3d"=..\..\..\..\code\nel\src\3d.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "driver_opengl"=..\..\..\..\code\nel\src\3d\driver\opengl\driver_opengl.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name 3d - End Project Dependency -}}} - -############################################################################### - -Project: "export"=.\export\export.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "game_share"=..\..\..\..\code\ryzom\src_v2\game_share.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "georges"=..\..\..\..\code\nel\src\georges.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency -}}} - -############################################################################### - -Project: "georges_edit_dll"=.\georges_dll\georges_edit_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name georges - End Project Dependency - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency -}}} - -############################################################################### - -Project: "georges_exe"=.\georges_exe\georges_exe.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name georges_dll - End Project Dependency - Begin Project Dependency - Project_Dep_Name georges_edit_dll - End Project Dependency - Begin Project Dependency - Project_Dep_Name georges - End Project Dependency -}}} - -############################################################################### - -Project: "land_export_lib"=..\3d\ligo\land_export_lib\land_export_lib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ligo"=..\..\..\..\code\nel\src\ligo.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "logic"=..\..\..\..\code\nel\src\logic.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "logic_editor_dll"=.\logic_editor_dll\logic_editor_dll.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name logic - End Project Dependency - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name net - End Project Dependency -}}} - -############################################################################### - -Project: "logic_editor_exe"=.\logic_editor_exe\logic_editor_exe.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name logic_editor_dll - End Project Dependency -}}} - -############################################################################### - -Project: "master"=.\master\master.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name georges_exe - End Project Dependency - Begin Project Dependency - Project_Dep_Name logic_editor_exe - End Project Dependency - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name 3d - End Project Dependency - Begin Project Dependency - Project_Dep_Name zviewer - End Project Dependency - Begin Project Dependency - Project_Dep_Name georges - End Project Dependency - Begin Project Dependency - Project_Dep_Name export - End Project Dependency - Begin Project Dependency - Project_Dep_Name ligo - End Project Dependency - Begin Project Dependency - Project_Dep_Name driver_opengl - End Project Dependency - Begin Project Dependency - Project_Dep_Name georges_edit_dll - End Project Dependency -}}} - -############################################################################### - -Project: "memory"=..\..\..\..\code\nel\src\memory.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "misc"=..\..\..\..\code\nel\src\misc.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "mission_compiler_fe"=.\mission_compiler_fe\mission_compiler_fe.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name mission_compiler_lib - End Project Dependency - Begin Project Dependency - Project_Dep_Name ligo - End Project Dependency - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name memory - End Project Dependency -}}} - -############################################################################### - -Project: "mission_compiler_lib"=.\mission_compiler_lib\mission_compiler_lib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "net"=..\..\..\..\code\nel\src\net.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pacs"=..\..\..\..\code\nel\src\pacs.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "sound"=..\..\..\..\code\nel\src\sound.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "world_editor"=..\3d\ligo\world_editor\world_editor.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name 3d - End Project Dependency - Begin Project Dependency - Project_Dep_Name ligo - End Project Dependency - Begin Project Dependency - Project_Dep_Name pacs - End Project Dependency - Begin Project Dependency - Project_Dep_Name georges - End Project Dependency - Begin Project Dependency - Project_Dep_Name memory - End Project Dependency -}}} - -############################################################################### - -Project: "world_editor_fauna_graph_plugin"=..\3d\ligo\world_editor_fauna_graph_plugin\world_editor_fauna_graph_plugin.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name 3d - End Project Dependency - Begin Project Dependency - Project_Dep_Name ligo - End Project Dependency -}}} - -############################################################################### - -Project: "world_editor_graph_plugin"=..\3d\ligo\world_editor_graph_plugin\world_editor_graph_plugin.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name ligo - End Project Dependency - Begin Project Dependency - Project_Dep_Name mission_compiler_lib - End Project Dependency -}}} - -############################################################################### - -Project: "world_editor_primitive_plugin"=..\3d\ligo\world_editor_primitive_plugin\world_editor_primitive_plugin.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name georges - End Project Dependency - Begin Project Dependency - Project_Dep_Name ligo - End Project Dependency -}}} - -############################################################################### - -Project: "world_editor_service"=..\3d\ligo\world_editor_service\world_editor_service.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "world_editor_shard_monitor_plugin"=..\3d\ligo\world_editor_shard_monitor_plugin\world_editor_shard_monitor_plugin.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name ligo - End Project Dependency - Begin Project Dependency - Project_Dep_Name net - End Project Dependency - Begin Project Dependency - Project_Dep_Name game_share - End Project Dependency -}}} - -############################################################################### - -Project: "worldeditor_sound_plugin"=..\3d\ligo\worldeditor_sound_plugin\worldeditor_sound_plugin.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name game_share - End Project Dependency - Begin Project Dependency - Project_Dep_Name georges - End Project Dependency - Begin Project Dependency - Project_Dep_Name sound - End Project Dependency - Begin Project Dependency - Project_Dep_Name 3d - End Project Dependency - Begin Project Dependency - Project_Dep_Name ligo - End Project Dependency -}}} - -############################################################################### - -Project: "zviewer"=..\..\..\..\code\tool\zviewer\zviewer.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name 3d - End Project Dependency - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.dsp b/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.dsp deleted file mode 100644 index c63a7172b..000000000 --- a/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.dsp +++ /dev/null @@ -1,154 +0,0 @@ -# Microsoft Developer Studio Project File - Name="georges_plugin_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=georges_plugin_test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "georges_plugin_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "georges_plugin_test.mak" CFG="georges_plugin_test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "georges_plugin_test - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "georges_plugin_test - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "georges_plugin_test - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 - -!ELSEIF "$(CFG)" == "georges_plugin_test - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "georges_plugin_test - Win32 Release" -# Name "georges_plugin_test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\georges_plugin_test.cpp -# End Source File -# Begin Source File - -SOURCE=.\georges_plugin_test.def -# End Source File -# Begin Source File - -SOURCE=.\georges_plugin_test.rc -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# Begin Source File - -SOURCE=.\test_global_dialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\test_local_dialog.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\georges_plugin_test.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=.\test_global_dialog.h -# End Source File -# Begin Source File - -SOURCE=.\test_local_dialog.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\georges_plugin_test.rc2 -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.vcproj b/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.vcproj new file mode 100644 index 000000000..d60da4c89 --- /dev/null +++ b/code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.vcproj @@ -0,0 +1,645 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/tools/leveldesign/master/master.dsp b/code/ryzom/tools/leveldesign/master/master.dsp deleted file mode 100644 index 2dd0ec00b..000000000 --- a/code/ryzom/tools/leveldesign/master/master.dsp +++ /dev/null @@ -1,325 +0,0 @@ -# Microsoft Developer Studio Project File - Name="master" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=master - Win32 DebugFast -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "master.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "master.mak" CFG="master - Win32 DebugFast" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "master - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "master - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "master - Win32 DebugFast" (based on "Win32 (x86) Application") -!MESSAGE "master - Win32 ReleaseDebug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "master - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../../code/nel/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 libxml2.lib freetype.lib /nologo /subsystem:windows /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Imports all DLLs -PostBuild_Cmds=copy ..\..\3d\ligo\worldeditor\release\worldeditor.dll . copy ..\georges_dll\georges_dll.dll . copy ..\logic_editor_dll\release\logic_editor.dll . -# End Special Build Tool - -!ELSEIF "$(CFG)" == "master - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../../../code/nel/include" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "__STL_DEBUG" /Yu"stdafx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libxml2_debug.lib freetype.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Imports all DLLs -PostBuild_Cmds=copy ..\..\3d\ligo\worldeditor\debug\worldeditor_debug.dll . copy ..\georges_dll\georges_dll_debug.dll . copy ..\logic_editor_dll\debug\logic_editor_debug.dll . -# End Special Build Tool - -!ELSEIF "$(CFG)" == "master - Win32 DebugFast" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DebugFast" -# PROP BASE Intermediate_Dir "DebugFast" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugFast" -# PROP Intermediate_Dir "DebugFast" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../../../code/nel/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "NL_DEBUG_FAST" /Yu"stdafx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libxml2.lib msvcrtd.lib libc.lib freetype.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /nodefaultlib -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Imports all DLLs -PostBuild_Cmds=copy ..\..\3d\ligo\worldeditor\debugfast\worldeditor_df.dll . copy ..\georges_dll\georges_dll_debug_fast.dll . copy ..\logic_editor_dll\debugfast\logic_editor_df.dll . -# End Special Build Tool - -!ELSEIF "$(CFG)" == "master - Win32 ReleaseDebug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ReleaseDebug" -# PROP BASE Intermediate_Dir "ReleaseDebug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDebug" -# PROP Intermediate_Dir "ReleaseDebug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../../../../../code/nel/include" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "NL_RELEASE_DEBUG" /D "WIN32" /D "NDEBUG" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 freetype.lib libxml2.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Imports all DLLs -PostBuild_Cmds=copy ..\..\3d\ligo\worldeditor\releasedebug\worldeditor_rd.dll . copy ..\georges_dll\georges_dll_rd.dll . copy ..\logic_editor_dll\releasedebug\logic_editor_rd.dll . -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "master - Win32 Release" -# Name "master - Win32 Debug" -# Name "master - Win32 DebugFast" -# Name "master - Win32 ReleaseDebug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ChooseDir.cpp -# End Source File -# Begin Source File - -SOURCE=.\ChooseTag.cpp -# End Source File -# Begin Source File - -SOURCE=.\ContinentCfg.cpp -# End Source File -# Begin Source File - -SOURCE=.\ContinentPropertiesDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\easy_cfg.cpp -# End Source File -# Begin Source File - -SOURCE=.\ExportCBDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\ExportDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\MainFrm.cpp -# End Source File -# Begin Source File - -SOURCE=.\master.cpp -# End Source File -# Begin Source File - -SOURCE=.\MasterTree.cpp -# End Source File -# Begin Source File - -SOURCE=.\NameEditDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\ChooseDir.h -# End Source File -# Begin Source File - -SOURCE=.\ChooseTag.h -# End Source File -# Begin Source File - -SOURCE=.\ContinentCfg.h -# End Source File -# Begin Source File - -SOURCE=.\ContinentPropertiesDlg.h -# End Source File -# Begin Source File - -SOURCE=.\easy_cfg.h -# End Source File -# Begin Source File - -SOURCE=.\ExportCBDlg.h -# End Source File -# Begin Source File - -SOURCE=.\ExportDlg.h -# End Source File -# Begin Source File - -SOURCE=.\MainFrm.h -# End Source File -# Begin Source File - -SOURCE=.\master.h -# End Source File -# Begin Source File - -SOURCE=.\MasterTree.h -# End Source File -# Begin Source File - -SOURCE=.\NameEditDlg.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\backup.ico -# End Source File -# Begin Source File - -SOURCE=.\res\continents.ico -# End Source File -# Begin Source File - -SOURCE=.\res\file.ico -# End Source File -# Begin Source File - -SOURCE=.\res\folder.ico -# End Source File -# Begin Source File - -SOURCE=.\res\master.ico -# End Source File -# Begin Source File - -SOURCE=.\master.rc -# End Source File -# Begin Source File - -SOURCE=.\res\master.rc2 -# End Source File -# Begin Source File - -SOURCE=.\res\masterDoc.ico -# End Source File -# Begin Source File - -SOURCE=.\res\regions.ico -# End Source File -# Begin Source File - -SOURCE=.\res\trash.ico -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/code/ryzom/tools/leveldesign/master/master.dsw b/code/ryzom/tools/leveldesign/master/master.dsw deleted file mode 100644 index 17d268638..000000000 --- a/code/ryzom/tools/leveldesign/master/master.dsw +++ /dev/null @@ -1,137 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "3d"=..\..\..\..\..\code\nel\src\3d.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "driver_opengl"=..\..\..\..\..\code\nel\src\3d\driver\opengl\driver_opengl.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name 3d - End Project Dependency -}}} - -############################################################################### - -Project: "export"=..\export\export.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name 3d - End Project Dependency - Begin Project Dependency - Project_Dep_Name lib - End Project Dependency - Begin Project Dependency - Project_Dep_Name georges_lib - End Project Dependency -}}} - -############################################################################### - -Project: "georges"=..\..\..\..\..\code\nel\src\georges.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ligo"=..\..\..\..\..\code\nel\src\ligo.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "master"=.\master.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name misc - End Project Dependency - Begin Project Dependency - Project_Dep_Name export - End Project Dependency - Begin Project Dependency - Project_Dep_Name 3d - End Project Dependency - Begin Project Dependency - Project_Dep_Name georges - End Project Dependency - Begin Project Dependency - Project_Dep_Name ligo - End Project Dependency - Begin Project Dependency - Project_Dep_Name driver_opengl - End Project Dependency -}}} - -############################################################################### - -Project: "misc"=..\..\..\..\..\code\nel\src\misc.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/code/ryzom/tools/leveldesign/master/master.vcproj b/code/ryzom/tools/leveldesign/master/master.vcproj new file mode 100644 index 000000000..11ced0450 --- /dev/null +++ b/code/ryzom/tools/leveldesign/master/master.vcproj @@ -0,0 +1,1923 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +