diff --git a/RCON.sln b/RCON.sln index 8cf69e3..d203044 100644 --- a/RCON.sln +++ b/RCON.sln @@ -17,20 +17,20 @@ Global Template|x86 = Template|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Debug|x64.ActiveCfg = Debug|x64 - {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Debug|x64.Build.0 = Debug|x64 + {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Debug|x64.ActiveCfg = Template|x64 + {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Debug|x64.Build.0 = Template|x64 {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Debug|x86.ActiveCfg = Debug|Win32 {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Debug|x86.Build.0 = Debug|Win32 - {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Release|x64.ActiveCfg = Release|x64 - {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Release|x64.Build.0 = Release|x64 + {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Release|x64.ActiveCfg = Template|x64 + {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Release|x64.Build.0 = Template|x64 {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Release|x86.ActiveCfg = Release|Win32 {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Release|x86.Build.0 = Release|Win32 {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Template|x64.ActiveCfg = Template|x64 {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Template|x64.Build.0 = Template|x64 {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Template|x86.ActiveCfg = Template|Win32 {13940DF3-6E53-495C-9A22-2E8999AE5E8F}.Template|x86.Build.0 = Template|Win32 - {ED8A17EB-3C75-45EC-A7D0-807F9AC6C37E}.Debug|x64.ActiveCfg = Debug|x64 - {ED8A17EB-3C75-45EC-A7D0-807F9AC6C37E}.Debug|x64.Build.0 = Debug|x64 + {ED8A17EB-3C75-45EC-A7D0-807F9AC6C37E}.Debug|x64.ActiveCfg = Release|x64 + {ED8A17EB-3C75-45EC-A7D0-807F9AC6C37E}.Debug|x64.Build.0 = Release|x64 {ED8A17EB-3C75-45EC-A7D0-807F9AC6C37E}.Debug|x86.ActiveCfg = Debug|Win32 {ED8A17EB-3C75-45EC-A7D0-807F9AC6C37E}.Debug|x86.Build.0 = Debug|Win32 {ED8A17EB-3C75-45EC-A7D0-807F9AC6C37E}.Release|x64.ActiveCfg = Release|x64 diff --git a/RCON/RCON.vcxproj b/RCON/RCON.vcxproj index 3169346..034d2f7 100644 --- a/RCON/RCON.vcxproj +++ b/RCON/RCON.vcxproj @@ -5,14 +5,14 @@ Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 @@ -31,17 +31,17 @@ v140 Unicode - + DynamicLibrary - false + true v140 - true Unicode - + DynamicLibrary - true + false v140 + true Unicode @@ -59,31 +59,55 @@ - + - + - + true $(ProjectDir)\inc\;$(IncludePath) - $(ProjectDir)\lib\Debug\;$(LibraryPath) + $(ProjectDir)\lib\$(Platform)\;$(LibraryPath) + $(SolutionDir)\$(Configuration)\ + $(Configuration)\$(Platform)\ + $(ProjectName)$(Platform) + + true + $(ProjectDir)\inc\;$(IncludePath) + $(ProjectDir)\lib\$(Platform)\;$(LibraryPath) + $(SolutionDir)\$(Configuration)\ + $(Configuration)\$(Platform)\ + $(ProjectName)$(Platform) + + false $(ProjectDir)\inc\;$(IncludePath) - $(ProjectDir)\lib\;$(LibraryPath) + $(ProjectDir)\lib\$(Platform)\;$(LibraryPath) + $(SolutionDir)\$(Configuration)\ + $(Configuration)\$(Platform)\ + $(ProjectName)$(Platform) + + false + $(ProjectDir)\inc\;$(IncludePath) + $(ProjectDir)\lib\$(Platform)\;$(LibraryPath) + $(SolutionDir)\$(Configuration)\ + $(Configuration)\$(Platform)\ + $(ProjectName)$(Platform) + + @@ -99,6 +123,13 @@ squirrel.lib;%(AdditionalDependencies) /NODEFAULTLIB:libcmt %(AdditionalOptions) + + + + + + rename "$(SolutionDir)\$(Configuration)\RCONWin32.dll" RCONx86.dll + @@ -106,12 +137,21 @@ Level3 Disabled - _DEBUG;_WINDOWS;_USRDLL;RCON_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;RCON_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Windows true + squirrel.lib;%(AdditionalDependencies) + /NODEFAULTLIB:libcmt %(AdditionalOptions) + + + + + + rename "$(SolutionDir)\$(Configuration)\RCONWin32.dll" RCONx86.dll + @@ -131,6 +171,13 @@ true squirrel.lib;%(AdditionalDependencies) + + + + + + rename "$(SolutionDir)\$(Configuration)\RCONWin32.dll" RCONx86.dll + @@ -140,14 +187,23 @@ MaxSpeed true true - NDEBUG;_WINDOWS;_USRDLL;RCON_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;RCON_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL Windows true true true + squirrel.lib;%(AdditionalDependencies) + + + + + + rename "$(SolutionDir)\$(Configuration)\RCONWin32.dll" RCONx86.dll + diff --git a/squirrelsrc/squirrel/squirrel.vcxproj b/squirrelsrc/squirrel/squirrel.vcxproj index f270931..3000a10 100644 --- a/squirrelsrc/squirrel/squirrel.vcxproj +++ b/squirrelsrc/squirrel/squirrel.vcxproj @@ -34,22 +34,24 @@ - Application - v100 + StaticLibrary + v140 + MultiByte - Application - v120 + StaticLibrary + v140 + MultiByte StaticLibrary v140 false - Unicode + MultiByte StaticLibrary - v100 + v140 false MultiByte @@ -61,7 +63,7 @@ StaticLibrary - v120 + v140 false MultiByte @@ -92,20 +94,34 @@ - $(SolutionDir)\RCON\lib\Debug\ + $(SolutionDir)\RCON\lib\$(Platform)\ $(Configuration)\ true + ..\include;$(IncludePath) true + $(SolutionDir)\RCON\lib\$(Platform)\ + ..\include;$(IncludePath) - $(SolutionDir)\RCON\lib\ + $(SolutionDir)\RCON\lib\$(Platform)\ $(Configuration)\ false + ..\include;$(IncludePath) false + $(SolutionDir)\RCON\lib\$(Platform)\ + ..\include;$(IncludePath) + + + $(SolutionDir)\RCON\lib\$(Platform)\ + ..\include;$(IncludePath) + + + $(SolutionDir)\RCON\lib\$(Platform)\ + ..\include;$(IncludePath) @@ -135,12 +151,12 @@ true - $(SolutionDir)\RCON\lib\Debug\squirrel.lib + $(SolutionDir)\RCON\lib\$(Platform)\squirrel.lib - MultiThreadedDebug + MultiThreadedDebugDLL Default false Disabled @@ -165,7 +181,7 @@ true - ..\lib\squirrel.lib + $(SolutionDir)\RCON\lib\$(Platform)\squirrel.lib @@ -194,12 +210,12 @@ true - $(SolutionDir)\RCON\lib\squirrel.lib + $(SolutionDir)\RCON\lib\$(Platform)\squirrel.lib - MultiThreaded + MultiThreadedDLL Default true true @@ -223,7 +239,17 @@ true - squirrelsrc\squirrel\$(Platform)\$(Configuration)\squirrel.lib + $(SolutionDir)\RCON\lib\$(Platform)\squirrel.lib + + + + + $(SolutionDir)\RCON\lib\$(Platform)\squirrel.lib + + + + + $(SolutionDir)\RCON\lib\$(Platform)\squirrel.lib