diff options
-rw-r--r-- | rAthena-9.sln | 12 | ||||
-rw-r--r-- | vcproj-9/char-server_sql.vcproj | 30 | ||||
-rw-r--r-- | vcproj-9/login-server_sql.vcproj | 14 | ||||
-rw-r--r-- | vcproj-9/map-server_sql.vcproj | 30 | ||||
-rw-r--r-- | vcproj-9/plugin-console.vcproj | 191 | ||||
-rw-r--r-- | vcproj-9/plugin-pid.vcproj | 191 |
6 files changed, 19 insertions, 449 deletions
diff --git a/rAthena-9.sln b/rAthena-9.sln index 7d8588f07..8ea06598a 100644 --- a/rAthena-9.sln +++ b/rAthena-9.sln @@ -8,10 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-9\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-9\mapcache.vcproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-console", "vcproj-9\plugin-console.vcproj", "{73E1101A-310C-4453-8F45-FD2795ABEF15}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-pid", "vcproj-9\plugin-pid.vcproj", "{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -34,14 +30,6 @@ Global {D356871D-58E1-450B-967A-E7E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E7E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-E7E9646175AF}.Release|Win32.Build.0 = Release|Win32 - {73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug|Win32.ActiveCfg = Debug|Win32 - {73E1101A-310C-4453-8F45-FD2795ABEF15}.Debug|Win32.Build.0 = Debug|Win32 - {73E1101A-310C-4453-8F45-FD2795ABEF15}.Release|Win32.ActiveCfg = Release|Win32 - {73E1101A-310C-4453-8F45-FD2795ABEF15}.Release|Win32.Build.0 = Release|Win32 - {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug|Win32.ActiveCfg = Debug|Win32 - {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Debug|Win32.Build.0 = Debug|Win32 - {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release|Win32.ActiveCfg = Release|Win32 - {9509E1B9-DA2B-4153-9EE0-CBCA6597F198}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj index 3e6e85558..09be67add 100644 --- a/vcproj-9/char-server_sql.vcproj +++ b/vcproj-9/char-server_sql.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="char-server_sql" ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}" RootNamespace="char-server_sql" @@ -345,18 +345,6 @@ > </File> <File - RelativePath="..\src\common\plugin.h" - > - </File> - <File - RelativePath="..\src\common\plugins.c" - > - </File> - <File - RelativePath="..\src\common\plugins.h" - > - </File> - <File RelativePath="..\src\common\random.c" > </File> @@ -433,6 +421,14 @@ > </File> <File + RelativePath="..\src\char\int_elemental.c" + > + </File> + <File + RelativePath="..\src\char\int_elemental.h" + > + </File> + <File RelativePath="..\src\char\int_guild.c" > </File> @@ -465,14 +461,6 @@ > </File> <File - RelativePath="..\src\char\int_elemental.c" - > - </File> - <File - RelativePath="..\src\char\int_elemental.h" - > - </File> - <File RelativePath="..\src\char\int_party.c" > </File> diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server_sql.vcproj index 2cf3c6e6c..74ad9b869 100644 --- a/vcproj-9/login-server_sql.vcproj +++ b/vcproj-9/login-server_sql.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="login-server_sql" ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}" RootNamespace="login-server_sql" @@ -315,18 +315,6 @@ > </File> <File - RelativePath="..\src\common\plugin.h" - > - </File> - <File - RelativePath="..\src\common\plugins.c" - > - </File> - <File - RelativePath="..\src\common\plugins.h" - > - </File> - <File RelativePath="..\src\common\random.c" > </File> diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj index a9f2b4fba..b36b21705 100644 --- a/vcproj-9/map-server_sql.vcproj +++ b/vcproj-9/map-server_sql.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="map-server_sql" ProjectGUID="{D356871D-58E1-450B-967A-E6E9646175AF}" RootNamespace="map-server_sql" @@ -368,18 +368,6 @@ > </File> <File - RelativePath="..\src\common\plugin.h" - > - </File> - <File - RelativePath="..\src\common\plugins.c" - > - </File> - <File - RelativePath="..\src\common\plugins.h" - > - </File> - <File RelativePath="..\src\common\random.c" > </File> @@ -520,6 +508,14 @@ > </File> <File + RelativePath="..\src\map\elemental.c" + > + </File> + <File + RelativePath="..\src\map\elemental.h" + > + </File> + <File RelativePath="..\src\map\config\classes\general.h" > </File> @@ -604,14 +600,6 @@ > </File> <File - RelativePath="..\src\map\elemental.c" - > - </File> - <File - RelativePath="..\src\map\elemental.h" - > - </File> - <File RelativePath="..\src\map\mob.c" > </File> diff --git a/vcproj-9/plugin-console.vcproj b/vcproj-9/plugin-console.vcproj deleted file mode 100644 index 9a13c2526..000000000 --- a/vcproj-9/plugin-console.vcproj +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="windows-1250"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="plugin-console" - ProjectGUID="{73E1101A-310C-4453-8F45-FD2795ABEF15}" - RootNamespace="plugin-console" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\plugins" - IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories="../3rdparty/msinttypes/include" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - DisableSpecificWarnings="4996" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1047" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)\console.dll" - LinkIncremental="1" - ModuleDefinitionFile="..\src\plugins\console.def" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" - RandomizedBaseAddress="1" - ImportLibrary="$(IntDir)\$(TargetName).lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\plugins" - IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/MP" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../3rdparty/msinttypes/include" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL" - StringPooling="true" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - DisableSpecificWarnings="4996" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1047" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)\console.dll" - LinkIncremental="1" - ModuleDefinitionFile="..\src\plugins\console.def" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" - RandomizedBaseAddress="1" - ImportLibrary="$(IntDir)\$(TargetName).lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\src\plugins\console.c" - > - </File> - <File - RelativePath="..\src\plugins\console.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/vcproj-9/plugin-pid.vcproj b/vcproj-9/plugin-pid.vcproj deleted file mode 100644 index 2dea26fcd..000000000 --- a/vcproj-9/plugin-pid.vcproj +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="windows-1250"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="plugin-pid" - ProjectGUID="{9509E1B9-DA2B-4153-9EE0-CBCA6597F198}" - RootNamespace="plugin-pid" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\plugins" - IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories="../3rdparty/msinttypes/include" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - DebugInformationFormat="3" - DisableSpecificWarnings="4996" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1047" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)\pid.dll" - LinkIncremental="1" - ModuleDefinitionFile="..\src\plugins\pid.def" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" - RandomizedBaseAddress="1" - ImportLibrary="$(IntDir)\$(TargetName).lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\plugins" - IntermediateDirectory="$(ProjectName)\$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/MP" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../3rdparty/msinttypes/include" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL" - StringPooling="true" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - DisableSpecificWarnings="4996" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1047" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)\pid.dll" - LinkIncremental="1" - ModuleDefinitionFile="..\src\plugins\pid.def" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" - RandomizedBaseAddress="1" - ImportLibrary="$(IntDir)\$(TargetName).lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\src\plugins\pid.c" - > - </File> - <File - RelativePath="..\src\plugins\pid.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> |