xaymar/BlitzExtensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Shift to __stdcall instead of __cdecl for compatability reasons.

Browse Source
This commit is contained in:
Michael Fabian Dirks
2015-05-17 11:50:08 +02:00
parent 38af4e7491
commit a5d7bf6af3
6 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BlitzUtility/BlitzUtility.vcxproj
+20 -13
View File
@@ -39,14 +39,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)\Build\$(ProjectName)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)\#Build\$(ProjectName)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\#Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(ProjectDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)\Build\$(ProjectName)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)\#Build\$(ProjectName)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\#Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(ProjectDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -63,15 +65,15 @@
<ForcedIncludeFiles>
</ForcedIncludeFiles>
<OpenMPSupport>false</OpenMPSupport>
<RuntimeTypeInfo>
</RuntimeTypeInfo>
<CreateHotpatchableImage>true</CreateHotpatchableImage>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<CreateHotpatchableImage>false</CreateHotpatchableImage>
<FunctionLevelLinking>false</FunctionLevelLinking>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<MultiProcessorCompilation>false</MultiProcessorCompilation>
<CompileAsManaged>false</CompileAsManaged>
<MinimalRebuild>false</MinimalRebuild>
<CompileAsWinRT>false</CompileAsWinRT>
<CallingConvention>StdCall</CallingConvention>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -100,15 +102,15 @@
</ForcedIncludeFiles>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<OpenMPSupport>false</OpenMPSupport>
<RuntimeTypeInfo>
</RuntimeTypeInfo>
<CreateHotpatchableImage>true</CreateHotpatchableImage>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<CreateHotpatchableImage>false</CreateHotpatchableImage>
<MinimalRebuild>false</MinimalRebuild>
<FunctionLevelLinking>true</FunctionLevelLinking>
<FunctionLevelLinking>false</FunctionLevelLinking>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<MultiProcessorCompilation>false</MultiProcessorCompilation>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<CallingConvention>StdCall</CallingConvention>
</ClCompile>
<Link>
<GenerateDebugInformation>false</GenerateDebugInformation>
@@ -138,9 +140,14 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="Containers\BlitzList.cpp" />
<ClCompile Include="Database\SQLite\sqlite3.c">
<CallingConvention Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Cdecl</CallingConvention>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
<CallingConvention Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Cdecl</CallingConvention>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="Utility\Indexer.cpp" />
<ClCompile Include="Database\SQLite\SQLite.cpp" />
<ClCompile Include="Database\SQLite\sqlite3.c" />
<ClCompile Include="Math\Matrix3.cpp" />
<ClCompile Include="Math\Vector3.cpp" />
<ClCompile Include="Math\Vector2.cpp" />
BlitzUtility/BlitzUtility.vcxproj.filters
+3 -3
View File
@@ -31,9 +31,6 @@
<ClCompile Include="Database\SQLite\SQLite.cpp">
<Filter>Source Files\Database\SQLite</Filter>
</ClCompile>
<ClCompile Include="Database\SQLite\sqlite3.c">
<Filter>Source Files\Database\SQLite</Filter>
</ClCompile>
<ClCompile Include="Math\Matrix3.cpp">
<Filter>Source Files\Math</Filter>
</ClCompile>
@@ -52,6 +49,9 @@
<ClCompile Include="Utility\WindowMessageHandler.cpp">
<Filter>Source Files\Utility</Filter>
</ClCompile>
<ClCompile Include="Database\SQLite\sqlite3.c">
<Filter>Source Files\Database\SQLite</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="dllmain.h">
BlitzUtility/Database/SQLite/sqlite3.c
+1 -1
View File
@@ -262,7 +262,7 @@ extern "C" {
# define SQLITE_CDECL
#endif
#ifndef SQLITE_STDCALL
# define SQLITE_STDCALL
# define SQLITE_STDCALL __cdecl
#endif
/*
BlitzUtility/Database/SQLite/sqlite3.h
+1 -1
View File
@@ -55,7 +55,7 @@ extern "C" {
# define SQLITE_CDECL
#endif
#ifndef SQLITE_STDCALL
# define SQLITE_STDCALL
# define SQLITE_STDCALL __cdecl
#endif
/*
BlitzUtility/Utility/WindowMessageHandler.cpp
+5
View File
@@ -52,6 +52,7 @@ DLL_EXPORT void WindowMessageHandler_Install(HWND hwnd) {
UserData->oUserData = SetWindowLong(hwnd, GWL_USERDATA, (LONG)UserData);
}
}
#pragma comment(linker, "/EXPORT:WindowMessageHandler_Install=_WindowMessageHandler_Install@4")
DLL_EXPORT void WindowMessageHandler_Uninstall(HWND hwnd) {
if (hwnd) {
@@ -63,6 +64,7 @@ DLL_EXPORT void WindowMessageHandler_Uninstall(HWND hwnd) {
}
}
}
#pragma comment(linker, "/EXPORT:WindowMessageHandler_Uninstall=_WindowMessageHandler_Uninstall@4")
DLL_EXPORT int WindowMessageHandler_Message_Resize(HWND hwnd, LPPOINT point) {
if (hwnd) {
@@ -77,6 +79,7 @@ DLL_EXPORT int WindowMessageHandler_Message_Resize(HWND hwnd, LPPOINT point) {
}
return 0;
}
#pragma comment(linker, "/EXPORT:WindowMessageHandler_Message_Resize=_WindowMessageHandler_Message_Resize@8")
DLL_EXPORT int WindowMessageHandler_Message_Destroy(HWND hwnd) {
if (hwnd) {
@@ -89,6 +92,7 @@ DLL_EXPORT int WindowMessageHandler_Message_Destroy(HWND hwnd) {
}
return 0;
}
#pragma comment(linker, "/EXPORT:WindowMessageHandler_Message_Destroy=_WindowMessageHandler_Message_Destroy@4")
DLL_EXPORT int WindowMessageHandler_Message_Close(HWND hwnd) {
if (hwnd) {
@@ -101,4 +105,5 @@ DLL_EXPORT int WindowMessageHandler_Message_Close(HWND hwnd) {
}
return 0;
}
#pragma comment(linker, "/EXPORT:WindowMessageHandler_Message_Close=_WindowMessageHandler_Message_Close@4")