Skip to content

Commit

Permalink
Add new version of extDB3 for Windows: v1033
Browse files Browse the repository at this point in the history
Add a MSVC project to build it
Reorganize the repository
  • Loading branch information
SteezCram committed Oct 30, 2020
1 parent 7d6b54a commit 8830266
Show file tree
Hide file tree
Showing 132 changed files with 5,683 additions and 1 deletion.
Binary file modified @extDB3/extDB3_x64.dll
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
25 changes: 25 additions & 0 deletions build/msvc/extDB3/extDB3.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extDB3", "extDB3\extDB3.vcxproj", "{2C235D90-ECAD-4C22-88CC-3DD4E904B84F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2C235D90-ECAD-4C22-88CC-3DD4E904B84F}.Debug|x64.ActiveCfg = Debug|x64
{2C235D90-ECAD-4C22-88CC-3DD4E904B84F}.Debug|x64.Build.0 = Debug|x64
{2C235D90-ECAD-4C22-88CC-3DD4E904B84F}.Release|x64.ActiveCfg = Release|x64
{2C235D90-ECAD-4C22-88CC-3DD4E904B84F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {513EF857-5A0E-4EAB-B008-672674936089}
EndGlobalSection
EndGlobal
134 changes: 134 additions & 0 deletions build/msvc/extDB3/extDB3/extDB3.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{2c235d90-ecad-4c22-88cc-3dd4e904b84f}</ProjectGuid>
<RootNamespace>extDB3</RootNamespace>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<LibraryPath>D:\Développement\C++ libs\tbb\lib\intel64\vc14;D:\Développement\C++ libs\mariadb-connector-c-3.1.10\lib;D:\Développement\C++ libs\boost_1_74_0\stage\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<LibraryPath>C:\Users\tcroi\source\c++\libs\mariadb-connector-c-3.1.10\lib;C:\Users\tcroi\source\c++\libs\tbb_arma\build\vs2013\x64\Release-MT;C:\Users\tcroi\source\c++\libs\boost_1_74_0\lib64-msvc-14.2;$(LibraryPath)</LibraryPath>
<TargetName>$(ProjectName)_x64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;EXTDB3_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>D:\Développement\C++ libs\boost_1_74_0;D:\Développement\C++ libs\tbb\include;D:\Développement\C++ libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>tbbmalloc.lib;crypt32.lib;secur32.lib;mariadbclient.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_WINDOWS;NOMINMAX;NDEBUG;_WIN32_WINNT=0x0600;TBB_MALLOC;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";extDB3_x64_EXPORTS;BOOST_BIND_GLOBAL_PLACEHOLDERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>C:\Users\tcroi\source\c++\libs\tbb_arma\include;C:\Users\tcroi\source\c++\libs\mariadb-connector-c-3.1.10;C:\Users\tcroi\source\c++\libs;C:\Users\tcroi\source\c++\libs\boost_1_74_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Full</Optimization>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>mariadbclient.lib;secur32.lib;crypt32.lib;shlwapi.lib;tbbmalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)extDB3_x64.dll</OutputFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="src\abstract_ext.h" />
<ClInclude Include="src\ext.h" />
<ClInclude Include="src\mariaDB\abstract.h" />
<ClInclude Include="src\mariaDB\binder.h" />
<ClInclude Include="src\mariaDB\connector.h" />
<ClInclude Include="src\mariaDB\exceptions.h" />
<ClInclude Include="src\mariaDB\pool.h" />
<ClInclude Include="src\mariaDB\query.h" />
<ClInclude Include="src\mariaDB\session.h" />
<ClInclude Include="src\mariaDB\statement.h" />
<ClInclude Include="src\md5\md5.h" />
<ClInclude Include="src\protocols\abstract_protocol.h" />
<ClInclude Include="src\protocols\log.h" />
<ClInclude Include="src\protocols\sql.h" />
<ClInclude Include="src\protocols\sql_custom.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\sqfparser.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\ext.cpp" />
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\mariaDB\binder.cpp" />
<ClCompile Include="src\mariaDB\connector.cpp" />
<ClCompile Include="src\mariaDB\pool.cpp" />
<ClCompile Include="src\mariaDB\query.cpp" />
<ClCompile Include="src\mariaDB\session.cpp" />
<ClCompile Include="src\mariaDB\statement.cpp" />
<ClCompile Include="src\md5\md5.cpp" />
<ClCompile Include="src\memory_allocator.cpp" />
<ClCompile Include="src\protocols\log.cpp" />
<ClCompile Include="src\protocols\sql.cpp" />
<ClCompile Include="src\protocols\sql_custom.cpp" />
<ClCompile Include="src\sqfparser.cpp" />
<ClCompile Include="src\test.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
135 changes: 135 additions & 0 deletions build/msvc/extDB3/extDB3/extDB3.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Fichiers sources">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Fichiers d%27en-tête">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Fichiers de ressources">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Fichiers sources\md5">
<UniqueIdentifier>{4ebd7c37-6255-45cb-b684-f05fb944a4c1}</UniqueIdentifier>
</Filter>
<Filter Include="Fichiers d%27en-tête\md5">
<UniqueIdentifier>{26157bfc-f410-45d5-a422-06897717900c}</UniqueIdentifier>
</Filter>
<Filter Include="Fichiers d%27en-tête\mariaDB">
<UniqueIdentifier>{9f99ebf7-44a5-47dc-8bae-8de6b7c5065c}</UniqueIdentifier>
</Filter>
<Filter Include="Fichiers sources\mariaDB">
<UniqueIdentifier>{8a34e202-f85e-4d18-8ccd-8de37b9f9bb5}</UniqueIdentifier>
</Filter>
<Filter Include="Fichiers d%27en-tête\protocols">
<UniqueIdentifier>{6fd90571-57b6-4973-af27-d584c6afd6c3}</UniqueIdentifier>
</Filter>
<Filter Include="Fichiers sources\protocols">
<UniqueIdentifier>{e1b4913a-897b-4e8c-983b-403f532c3d94}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\resource.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="src\sqfparser.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="src\abstract_ext.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="src\ext.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="src\md5\md5.h">
<Filter>Fichiers d%27en-tête\md5</Filter>
</ClInclude>
<ClInclude Include="src\mariaDB\abstract.h">
<Filter>Fichiers d%27en-tête\mariaDB</Filter>
</ClInclude>
<ClInclude Include="src\mariaDB\binder.h">
<Filter>Fichiers d%27en-tête\mariaDB</Filter>
</ClInclude>
<ClInclude Include="src\mariaDB\connector.h">
<Filter>Fichiers d%27en-tête\mariaDB</Filter>
</ClInclude>
<ClInclude Include="src\mariaDB\pool.h">
<Filter>Fichiers d%27en-tête\mariaDB</Filter>
</ClInclude>
<ClInclude Include="src\mariaDB\query.h">
<Filter>Fichiers d%27en-tête\mariaDB</Filter>
</ClInclude>
<ClInclude Include="src\mariaDB\session.h">
<Filter>Fichiers d%27en-tête\mariaDB</Filter>
</ClInclude>
<ClInclude Include="src\mariaDB\statement.h">
<Filter>Fichiers d%27en-tête\mariaDB</Filter>
</ClInclude>
<ClInclude Include="src\mariaDB\exceptions.h">
<Filter>Fichiers d%27en-tête\mariaDB</Filter>
</ClInclude>
<ClInclude Include="src\protocols\sql_custom.h">
<Filter>Fichiers d%27en-tête\protocols</Filter>
</ClInclude>
<ClInclude Include="src\protocols\abstract_protocol.h">
<Filter>Fichiers d%27en-tête\protocols</Filter>
</ClInclude>
<ClInclude Include="src\protocols\log.h">
<Filter>Fichiers d%27en-tête\protocols</Filter>
</ClInclude>
<ClInclude Include="src\protocols\sql.h">
<Filter>Fichiers d%27en-tête\protocols</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\memory_allocator.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="src\sqfparser.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="src\test.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="src\ext.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="src\md5\md5.cpp">
<Filter>Fichiers sources\md5</Filter>
</ClCompile>
<ClCompile Include="src\mariaDB\statement.cpp">
<Filter>Fichiers sources\mariaDB</Filter>
</ClCompile>
<ClCompile Include="src\mariaDB\binder.cpp">
<Filter>Fichiers sources\mariaDB</Filter>
</ClCompile>
<ClCompile Include="src\mariaDB\connector.cpp">
<Filter>Fichiers sources\mariaDB</Filter>
</ClCompile>
<ClCompile Include="src\mariaDB\pool.cpp">
<Filter>Fichiers sources\mariaDB</Filter>
</ClCompile>
<ClCompile Include="src\mariaDB\query.cpp">
<Filter>Fichiers sources\mariaDB</Filter>
</ClCompile>
<ClCompile Include="src\mariaDB\session.cpp">
<Filter>Fichiers sources\mariaDB</Filter>
</ClCompile>
<ClCompile Include="src\protocols\sql_custom.cpp">
<Filter>Fichiers sources\protocols</Filter>
</ClCompile>
<ClCompile Include="src\protocols\log.cpp">
<Filter>Fichiers sources\protocols</Filter>
</ClCompile>
<ClCompile Include="src\protocols\sql.cpp">
<Filter>Fichiers sources\protocols</Filter>
</ClCompile>
<ClCompile Include="src\main.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions build/msvc/extDB3/extDB3/extDB3.vcxproj.user
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
54 changes: 54 additions & 0 deletions build/msvc/extDB3/extDB3/src/abstract_ext.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* extDB3
* © 2016 Declan Ireland <https://bitbucket.org/torndeco/extdb3>
*/

#pragma once

#include <thread>
#include <unordered_map>

#include "spdlog/spdlog.h"

#include "mariaDB/pool.h"


#define EXTDB_VERSION "1.033"
#define EXTDB_CONF_VERSION 1


class AbstractExt
{
public:
struct resultData
{
bool wait = true;
std::string message;
};

std::unordered_map<std::string, MariaDBPool> mariadb_databases;

// extInfo
struct extInfo
{
int max_threads;
bool allow_reset = false;

bool logger_flush = true;

bool extDB_lock = false;
std::string extDB_lockCode;

std::string path;
std::string log_path;
};
extInfo ext_info;


#ifdef DEBUG_TESTING
std::shared_ptr<spdlog::logger> console;
#elif TEST_APP
std::shared_ptr<spdlog::logger> console;
#endif
std::shared_ptr<spdlog::logger> logger;
};
Binary file added build/msvc/extDB3/extDB3/src/dll-debug.aps
Binary file not shown.
35 changes: 35 additions & 0 deletions build/msvc/extDB3/extDB3/src/dll-debug.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#include <windows.h>

#define PRODUCT_NAME_STR "extDB3 Debug"
#define PRODUCT_DESCRIPTION "Arma3 Database Extension"
#define VER_VERSION 1,0,3,2
#define VER_VERSION_STR "1.0.3.2"

VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_VERSION
PRODUCTVERSION VER_VERSION
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE VFT2_UNKNOWN
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
BEGIN
VALUE "FileDescription", PRODUCT_DESCRIPTION
VALUE "FileVersion", VER_VERSION_STR
VALUE "ProductName", PRODUCT_NAME_STR
VALUE "ProductVersion", VER_VERSION_STR
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0, 1200
END
END
Binary file added build/msvc/extDB3/extDB3/src/dll.aps
Binary file not shown.
Loading

0 comments on commit 8830266

Please sign in to comment.