revert sdl2 and make lib changes
This commit is contained in:
parent
5cb5f14520
commit
692ac17e73
@ -2,20 +2,6 @@
|
||||
#include <Windows.h>
|
||||
#include "MinHook.h"
|
||||
|
||||
#if defined _M_X64
|
||||
#ifdef _DEBUG
|
||||
#pragma comment(lib, "Common Files/MinHook/x64/Debug/MinHook.lib")
|
||||
#else
|
||||
#pragma comment(lib, "Common Files/MinHook/x64/Release/MinHook.lib")
|
||||
#endif
|
||||
#elif defined _M_IX86
|
||||
#ifdef _DEBUG
|
||||
#pragma comment(lib, "Common Files/MinHook/x86/Debug/MinHook.lib")
|
||||
#else
|
||||
#pragma comment(lib, "Common Files/MinHook/x86/Release/MinHook.lib")
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// struct
|
||||
struct EffectTriggers {
|
||||
void(*Constant)(int direction, double strength);
|
||||
|
@ -294,7 +294,8 @@
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>Debug</GenerateDebugInformation>
|
||||
<ModuleDefinitionFile>dinput8.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;xinput.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;xinput.lib;Common Files/MinHook/x86/Debug/MinHook.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
|
||||
</Link>
|
||||
<ResourceCompile>
|
||||
<AdditionalIncludeDirectories>Resources</AdditionalIncludeDirectories>
|
||||
@ -327,7 +328,8 @@
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>Debug</GenerateDebugInformation>
|
||||
<ModuleDefinitionFile>dinput8.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;xinput.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;xinput.lib;Common Files/MinHook/x64/Debug/MinHook.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<IgnoreSpecificDefaultLibraries>libcmtd.lib</IgnoreSpecificDefaultLibraries>
|
||||
</Link>
|
||||
<ResourceCompile>
|
||||
<AdditionalIncludeDirectories>Resources</AdditionalIncludeDirectories>
|
||||
@ -361,9 +363,10 @@
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>No</GenerateDebugInformation>
|
||||
<ModuleDefinitionFile>dinput8.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Common Files/MinHook/x86/Release/MinHook.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ImageHasSafeExceptionHandlers />
|
||||
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
|
||||
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
|
||||
</Link>
|
||||
<ResourceCompile>
|
||||
<AdditionalIncludeDirectories>Resources</AdditionalIncludeDirectories>
|
||||
@ -413,7 +416,10 @@ cd $(OutDir) &amp;&amp; for /D /r %d in (.\Deploy\*) do @xcopy *.dll %d\
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>No</GenerateDebugInformation>
|
||||
<ModuleDefinitionFile>dinput8.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>dinput8.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Common Files/MinHook/x64/Release/MinHook.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<IgnoreAllDefaultLibraries>
|
||||
</IgnoreAllDefaultLibraries>
|
||||
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
|
||||
</Link>
|
||||
<ResourceCompile>
|
||||
<AdditionalIncludeDirectories>Resources</AdditionalIncludeDirectories>
|
||||
@ -435,14 +441,14 @@ cd $(OutDir) &amp;&amp; for /D /r %d in (.\Deploy\*) do @xcopy *.dll %d\
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
|
||||
<Import Project="packages\sdl2.nuget.redist.2.26.3\build\native\sdl2.nuget.redist.targets" Condition="Exists('packages\sdl2.nuget.redist.2.26.3\build\native\sdl2.nuget.redist.targets')" />
|
||||
<Import Project="packages\sdl2.nuget.2.26.3\build\native\sdl2.nuget.targets" Condition="Exists('packages\sdl2.nuget.2.26.3\build\native\sdl2.nuget.targets')" />
|
||||
<Import Project="packages\sdl2.nuget.redist.2.24.2\build\native\sdl2.nuget.redist.targets" Condition="Exists('packages\sdl2.nuget.redist.2.24.2\build\native\sdl2.nuget.redist.targets')" />
|
||||
<Import Project="packages\sdl2.nuget.2.24.2\build\native\sdl2.nuget.targets" Condition="Exists('packages\sdl2.nuget.2.24.2\build\native\sdl2.nuget.targets')" />
|
||||
</ImportGroup>
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('packages\sdl2.nuget.redist.2.26.3\build\native\sdl2.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\sdl2.nuget.redist.2.26.3\build\native\sdl2.nuget.redist.targets'))" />
|
||||
<Error Condition="!Exists('packages\sdl2.nuget.2.26.3\build\native\sdl2.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\sdl2.nuget.2.26.3\build\native\sdl2.nuget.targets'))" />
|
||||
<Error Condition="!Exists('packages\sdl2.nuget.redist.2.24.2\build\native\sdl2.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\sdl2.nuget.redist.2.24.2\build\native\sdl2.nuget.redist.targets'))" />
|
||||
<Error Condition="!Exists('packages\sdl2.nuget.2.24.2\build\native\sdl2.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\sdl2.nuget.2.24.2\build\native\sdl2.nuget.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="sdl2.nuget" version="2.26.3" targetFramework="native" />
|
||||
<package id="sdl2.nuget.redist" version="2.26.3" targetFramework="native" />
|
||||
<package id="sdl2.nuget" version="2.24.2" targetFramework="native" />
|
||||
<package id="sdl2.nuget.redist" version="2.24.2" targetFramework="native" />
|
||||
</packages>
|
Loading…
Reference in New Issue
Block a user