From ad487dae191b772df7db95bd08907301b9e02769 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 May 2010 22:04:05 +0200 Subject: [PATCH] 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +