Skip to content

Commit

Permalink
Changed: Bootstrapper now compiles to a single DLL.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sewer56
Sewer56 committed Jul 22, 2021
1 parent 2a8cb18 commit 4ea4385
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 32 deletions.
45 changes: 16 additions & 29 deletions source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Bootstrapper.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand All @@ -42,7 +42,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -93,10 +93,10 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
Expand All @@ -109,7 +109,7 @@
<EnableUAC>false</EnableUAC>
<OutputFile>$(OutDir)\X86\Bootstrapper\$(TargetName)$(TargetExt)</OutputFile>
<ProgramDatabaseFile>$(OutDir)\X86\Bootstrapper\$(TargetName).pdb</ProgramDatabaseFile>
<DelayLoadDLLs>nethost.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -118,10 +118,10 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
Expand All @@ -134,7 +134,7 @@
<EnableUAC>false</EnableUAC>
<OutputFile>$(OutDir)\X64\Bootstrapper\$(TargetName)$(TargetExt)</OutputFile>
<ProgramDatabaseFile>$(OutDir)\X64\Bootstrapper\$(TargetName).pdb</ProgramDatabaseFile>
<DelayLoadDLLs>nethost.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -145,10 +145,10 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
Expand All @@ -163,7 +163,7 @@
<EnableUAC>false</EnableUAC>
<OutputFile>$(OutDir)\X86\Bootstrapper\$(TargetName)$(TargetExt)</OutputFile>
<ProgramDatabaseFile>$(OutDir)\X86\Bootstrapper\$(TargetName).pdb</ProgramDatabaseFile>
<DelayLoadDLLs>nethost.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -174,10 +174,10 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
Expand All @@ -192,7 +192,7 @@
<EnableUAC>false</EnableUAC>
<OutputFile>$(OutDir)\X64\Bootstrapper\$(TargetName)$(TargetExt)</OutputFile>
<ProgramDatabaseFile>$(OutDir)\X64\Bootstrapper\$(TargetName).pdb</ProgramDatabaseFile>
<DelayLoadDLLs>nethost.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -223,26 +223,13 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ItemGroup>
<ContentWithTargetPath Include="nethost/x64-libs/nethost.dll" Condition="'$(Platform)'=='x64'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>X64\Bootstrapper\nethost.dll</TargetPath>
</ContentWithTargetPath>
</ItemGroup>
<ItemGroup>
<ContentWithTargetPath Include="nethost/x86-libs/nethost.dll" Condition="'$(Platform)'=='Win32'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>X86\Bootstrapper\nethost.dll</TargetPath>
</ContentWithTargetPath>
</ItemGroup>
<ItemGroup>
<Library Include="nethost\x64-libs\nethost.lib">
<FileType>Document</FileType>
<Library Include="nethost\x64-libs\libnethost.lib">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</Library>
<Library Include="nethost\x86-libs\nethost.lib">
<Library Include="nethost\x86-libs\libnethost.lib">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
Expand Down
4 changes: 2 additions & 2 deletions source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Bootstrapper.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<Library Include="nethost\x86-libs\nethost.lib">
<Library Include="nethost\x86-libs\libnethost.lib">
<Filter>Header Files\nethost\x86-libs</Filter>
</Library>
<Library Include="nethost\x64-libs\nethost.lib">
<Library Include="nethost\x64-libs\libnethost.lib">
<Filter>Header Files\nethost\x64-libs</Filter>
</Library>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/Reloaded.Mod.Loader.Bootstrapper/dllmain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,4 @@ extern "C"
entryPointParameters.flags |= LoadedExternally;
WaitForSingleObject(initializeThreadHandle, INFINITE);
}
}
}
Binary file added source/Reloaded.Mod.Loader.Bootstrapper/nethost/x64-libs/libnethost.lib
View file
Binary file not shown.
Binary file removed source/Reloaded.Mod.Loader.Bootstrapper/nethost/x64-libs/nethost.dll
View file
Binary file not shown.
Binary file removed source/Reloaded.Mod.Loader.Bootstrapper/nethost/x64-libs/nethost.lib
View file
Binary file not shown.
Binary file added source/Reloaded.Mod.Loader.Bootstrapper/nethost/x86-libs/libnethost.lib
View file
Binary file not shown.
Binary file removed source/Reloaded.Mod.Loader.Bootstrapper/nethost/x86-libs/nethost.dll
View file
Binary file not shown.
Binary file removed source/Reloaded.Mod.Loader.Bootstrapper/nethost/x86-libs/nethost.lib
View file
Binary file not shown.

0 comments on commit 4ea4385

Please sign in to comment.