Update

2015-06-20 16:53:37 +02:00
parent 79fdb08656
commit 0aeb327ead
4 changed files with 40 additions and 55 deletions
@@ -41,14 +41,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <OutDir>$(SolutionDir)\#Build\$(ProjectName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)\#Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <OutDir>$(SolutionDir)\#Build\$(ProjectName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)\#Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@@ -56,9 +54,9 @@
      <Optimization>Disabled</Optimization>
      <SDLCheck>
      </SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>SQLITE_ENABLE_FTS4;SQLITE_ENABLE_RTREE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
      <StructMemberAlignment>4Bytes</StructMemberAlignment>
      <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -69,21 +67,35 @@
      <CreateHotpatchableImage>false</CreateHotpatchableImage>
      <FunctionLevelLinking>false</FunctionLevelLinking>
      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
-      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <CompileAsManaged>false</CompileAsManaged>
      <MinimalRebuild>false</MinimalRebuild>
      <CompileAsWinRT>false</CompileAsWinRT>
-      <CallingConvention>StdCall</CallingConvention>
+      <CallingConvention>Cdecl</CallingConvention>
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <StringPooling>true</StringPooling>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <Version>1.0</Version>
      <LinkStatus>
      </LinkStatus>
+      <CreateHotPatchableImage>Enabled</CreateHotPatchableImage>
+      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <FixedBaseAddress>false</FixedBaseAddress>
    </Link>
    <CustomBuildStep>
      <Message>Copying Resources</Message>
    </CustomBuildStep>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@@ -92,9 +104,9 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>
      </SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>SQLITE_ENABLE_FTS4;SQLITE_ENABLE_RTREE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <StructMemberAlignment>4Bytes</StructMemberAlignment>
      <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -107,38 +119,45 @@
      <MinimalRebuild>false</MinimalRebuild>
      <FunctionLevelLinking>false</FunctionLevelLinking>
      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
-      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <CompileAsManaged>false</CompileAsManaged>
      <CompileAsWinRT>false</CompileAsWinRT>
-      <CallingConvention>StdCall</CallingConvention>
+      <CallingConvention>Cdecl</CallingConvention>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <StringPooling>true</StringPooling>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>
-      </EnableCOMDATFolding>
+      <EnableCOMDATFolding>false</EnableCOMDATFolding>
      <OptimizeReferences>
      </OptimizeReferences>
      <Version>1.0</Version>
      <LinkStatus>
      </LinkStatus>
+      <CreateHotPatchableImage>Enabled</CreateHotPatchableImage>
+      <FixedBaseAddress>false</FixedBaseAddress>
    </Link>
    <CustomBuildStep>
      <Message>Copying Resources</Message>
    </CustomBuildStep>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="Container\List.h" />
    <ClInclude Include="dllmain.h" />
    <ClInclude Include="Container\TypeList.h" />
-    <ClInclude Include="Libraries\BlitzPointer.h" />
    <ClInclude Include="Utility\MassOp.h" />
    <ClInclude Include="Type\Double.h" />
    <ClInclude Include="Type\LongLong.h" />
    <ClInclude Include="Utility\IndexerV1.h" />
    <ClInclude Include="Database\SQLite\SQLite.h" />
    <ClInclude Include="Database\SQLite\sqlite3.h" />
-    <ClInclude Include="Math\FVector2.h" />
-    <ClInclude Include="Math\BVector3.h" />
    <ClInclude Include="Utility\DisplayEnumerator.h" />
    <ClInclude Include="Utility\IndexerV2.h" />
    <ClInclude Include="Utility\WindowMessageHandler.h" />
@@ -152,13 +171,10 @@
      <CallingConvention Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Cdecl</CallingConvention>
      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
    </ClCompile>
-    <ClCompile Include="Libraries\BlitzPointer.cpp" />
    <ClCompile Include="Type\Double.cpp" />
    <ClCompile Include="Type\LongLong.cpp" />
    <ClCompile Include="Utility\IndexerV1.cpp" />
    <ClCompile Include="Database\SQLite\SQLite.cpp" />
-    <ClCompile Include="Math\BVector3.cpp" />
-    <ClCompile Include="Math\FVector2.cpp" />
    <ClCompile Include="dllmain.cpp" />
    <ClCompile Include="Utility\DisplayEnumerator.cpp" />
    <ClCompile Include="Utility\IndexerV2.cpp" />
@@ -14,9 +14,6 @@
    <Filter Include="Source Files\Database\SQLite">
      <UniqueIdentifier>{3ac37a01-a835-479c-b0b0-ecfd04640134}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\Math">
-      <UniqueIdentifier>{38444b44-ebf1-4cae-a1a3-1a0b80b045a1}</UniqueIdentifier>
-    </Filter>
    <Filter Include="Blitz Files">
      <UniqueIdentifier>{e8e48b8c-14c2-40b5-b48d-d9b55fe6852d}</UniqueIdentifier>
    </Filter>
@@ -26,9 +23,6 @@
    <Filter Include="Source Files\Type">
      <UniqueIdentifier>{605f2cca-0949-4af8-ab67-7042309a2abc}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\Libraries">
-      <UniqueIdentifier>{2b65f925-151d-4073-a06e-8d7d4603ef16}</UniqueIdentifier>
-    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="dllmain.cpp">
@@ -67,15 +61,6 @@
    <ClCompile Include="Utility\DisplayEnumerator.cpp">
      <Filter>Source Files\Utility</Filter>
    </ClCompile>
-    <ClCompile Include="Math\BVector3.cpp">
-      <Filter>Source Files\Math</Filter>
-    </ClCompile>
-    <ClCompile Include="Math\FVector2.cpp">
-      <Filter>Source Files\Math</Filter>
-    </ClCompile>
-    <ClCompile Include="Libraries\BlitzPointer.cpp">
-      <Filter>Source Files\Libraries</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="dllmain.h">
@@ -114,15 +99,6 @@
    <ClInclude Include="Utility\DisplayEnumerator.h">
      <Filter>Source Files\Utility</Filter>
    </ClInclude>
-    <ClInclude Include="Math\BVector3.h">
-      <Filter>Source Files\Math</Filter>
-    </ClInclude>
-    <ClInclude Include="Math\FVector2.h">
-      <Filter>Source Files\Math</Filter>
-    </ClInclude>
-    <ClInclude Include="Libraries\BlitzPointer.h">
-      <Filter>Source Files\Libraries</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="BlitzUtility.bb">
@@ -15,7 +15,7 @@
 //	along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include "SQLite.h"
-#include "..\BlitzPointer\Include\BlitzPointer.h"
+#include "..\BlitzPointer\BlitzPointer.h"

 DLL_METHOD const char* DLL_CALL SQLite_Version() {
 	return sqlite3_version;
@@ -77,7 +77,8 @@ DLL_METHOD int32_t DLL_CALL SQLite_Busy_Timeout(sqlite3* db, int32_t timeout) {
 }

 int __cdecl SQLite3_Busy_Handler_Internal(void* handler, int prm) {
-	return BlitzPointer_CallFunction1((int32_t)handler, (int32_t)prm);
+	BP_BlitzFunction1_t lpFunctionPointer = (BP_BlitzFunction1_t)handler;
+	return lpFunctionPointer((int32_t)prm);
 }

 DLL_METHOD int32_t DLL_CALL SQLite_Busy_Handler(sqlite3* db, int32_t handler) {
@@ -16,10 +16,6 @@

 #pragma once

-// STL Exceptions
-#include <exception>
-#include <stdexcept>
-
 // Memory Management
 #include <memory>

@@ -32,11 +28,7 @@
 #include <windows.h>

 // Macros
-#ifndef IMPORT
-	#define DLL_METHOD extern "C" //__declspec(dllexport)
-#else
-	#define DLL_METHOD extern "c" __declspec(dllimport)
-#endif
+#define DLL_METHOD extern "C"
 #define DLL_CALL __stdcall

 //Templates