From 1afc37c9161c4e7fb6834c616dfb01d73fed427b Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 25 Feb 2016 14:24:54 +0100 Subject: [PATCH] Empty libZRColaUI project added --- ZRCola.sln | 11 ++ ZRCola/ZRCola.props | 2 +- lib/libZRColaUI/build/libZRColaUI.props | 20 ++++ lib/libZRColaUI/build/libZRColaUI.vcxproj | 106 ++++++++++++++++++ .../build/libZRColaUI.vcxproj.filters | 35 ++++++ lib/libZRColaUI/include/zrcolaui/common.h | 39 +++++++ lib/libZRColaUI/res/libZRColaUI.rc | Bin 0 -> 3282 bytes lib/libZRColaUI/src/stdafx.cpp | 20 ++++ lib/libZRColaUI/src/stdafx.h | 22 ++++ 9 files changed, 254 insertions(+), 1 deletion(-) create mode 100644 lib/libZRColaUI/build/libZRColaUI.props create mode 100644 lib/libZRColaUI/build/libZRColaUI.vcxproj create mode 100644 lib/libZRColaUI/build/libZRColaUI.vcxproj.filters create mode 100644 lib/libZRColaUI/include/zrcolaui/common.h create mode 100644 lib/libZRColaUI/res/libZRColaUI.rc create mode 100644 lib/libZRColaUI/src/stdafx.cpp create mode 100644 lib/libZRColaUI/src/stdafx.h diff --git a/ZRCola.sln b/ZRCola.sln index ef78c6c..b42fed6 100644 --- a/ZRCola.sln +++ b/ZRCola.sln @@ -14,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\build\libZRCola.vcxproj", "{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -46,6 +48,14 @@ Global {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.Build.0 = Release|Win32 {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.ActiveCfg = Release|x64 {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.Build.0 = Release|x64 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.ActiveCfg = Debug|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.Build.0 = Debug|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.ActiveCfg = Debug|x64 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.Build.0 = Debug|x64 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.ActiveCfg = Release|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.Build.0 = Release|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.ActiveCfg = Release|x64 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -53,5 +63,6 @@ Global GlobalSection(NestedProjects) = preSolution {A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} {3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} + {C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} EndGlobalSection EndGlobal diff --git a/ZRCola/ZRCola.props b/ZRCola/ZRCola.props index 5eebfca..acf3f75 100644 --- a/ZRCola/ZRCola.props +++ b/ZRCola/ZRCola.props @@ -7,7 +7,7 @@ - ..\lib\wxExtend\include;..\lib\libZRCola\include + ..\lib\wxExtend\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include diff --git a/lib/libZRColaUI/build/libZRColaUI.props b/lib/libZRColaUI/build/libZRColaUI.props new file mode 100644 index 0000000..dd8e6f9 --- /dev/null +++ b/lib/libZRColaUI/build/libZRColaUI.props @@ -0,0 +1,20 @@ + + + + + 10 + + + ..\..\..\output\$(Platform).$(Configuration)\ + + + + LIBZRCOLAUI;%(PreprocessorDefinitions) + + + + + $(libZRColaUIVersion) + + + \ No newline at end of file diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj b/lib/libZRColaUI/build/libZRColaUI.vcxproj new file mode 100644 index 0000000..4d2b2a0 --- /dev/null +++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj @@ -0,0 +1,106 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + Create + Create + Create + Create + + + + + + + + + + + {C0A84BD2-3870-4CD6-B281-0AB322E3C579} + libZRColaUI + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(ProjectName)$(libZRColaUIVersion)ud_vc$(PlatformToolsetVersion) + + + $(ProjectName)$(libZRColaUIVersion)ud_vc$(PlatformToolsetVersion)_$(Platform) + + + $(ProjectName)$(libZRColaUIVersion)u_vc$(PlatformToolsetVersion) + + + $(ProjectName)$(libZRColaUIVersion)u_vc$(PlatformToolsetVersion)_$(Platform) + + + + + \ No newline at end of file diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters b/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters new file mode 100644 index 0000000..e0a2fd7 --- /dev/null +++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters @@ -0,0 +1,35 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/lib/libZRColaUI/include/zrcolaui/common.h b/lib/libZRColaUI/include/zrcolaui/common.h new file mode 100644 index 0000000..18605eb --- /dev/null +++ b/lib/libZRColaUI/include/zrcolaui/common.h @@ -0,0 +1,39 @@ +/* + Copyright 2015-2016 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#pragma once + + +/// +/// Public function calling convention +/// +#ifdef LIBZRCOLAUI +#define ZRCOLAUI_API __declspec(dllexport) +#else +#define ZRCOLAUI_API __declspec(dllimport) +#endif +#define ZRCOLA_NOVTABLE __declspec(novtable) +#pragma warning(push) +#pragma warning(disable: 4251) + + +namespace ZRCola { +}; + +#pragma warning(pop) diff --git a/lib/libZRColaUI/res/libZRColaUI.rc b/lib/libZRColaUI/res/libZRColaUI.rc new file mode 100644 index 0000000000000000000000000000000000000000..1f3791f18d318ab8f21b5e6365c3409093a4f1eb GIT binary patch literal 3282 zcmdUxU2hUW6o${WiT`26n>Nu(YrQZrCbR{tMYh=m{D=vm7AUc@gr$DPKjfcOpEJXB zcgg~3(~Fu3?9R-4=A84MkJ-O}9?D3@@=4C+LQbVGfs|y6@sV-$=_3{KQ>Mr!NcTXW zA$wo$ncw2MFTf1sI}&|K4f^F$jQqO*JXNR*ckSdH0;berLXE3@UZB|Ay z!=F>;F>gIHOJ$R}Wh5a2%BHfDXK?`Hfr-t)u%c&dNJVP$PP!7IEtU`sk?ix{l>=!o z^xR*JV5ww_Ga{)YQI#h0n?`Gc)h4TLo^^Ht&ax{OS7&~R##i!)y%^lyQbd>C_|liV zAGs`o9g}$}d?!TCt-Gjn@Tw~v*ok;Mg#9M-L;h>L2Um97x=IK0Q3KsT-ajLd4}Qi$KkAT_=vpZY)P8 zej48zL#wGuhPSB&ttX9bwx>L34pdDnRa)z15mkYueJZBPX+`@H9Cy&(0+BJkh>YbJ z#6IW>8Z)G3miF7hyw(HH?xMWQy!JiHytQZc>0&9hu)NGDAa! zY%R9NF?N7-%AKZ6PGHpbQ)iX!WA^JIFr7wkn-O+S(Kp49Vt!WZ^n16}wYp=*feyNes;;Y#>3wU+pY!#ss+w;yqi)z;dn!>bx59X^w`<3k#TASM@Z^~YdX4YnJSNpHa PU;XyFt?$yi{T=rYwAQ6> literal 0 HcmV?d00001 diff --git a/lib/libZRColaUI/src/stdafx.cpp b/lib/libZRColaUI/src/stdafx.cpp new file mode 100644 index 0000000..ac111f1 --- /dev/null +++ b/lib/libZRColaUI/src/stdafx.cpp @@ -0,0 +1,20 @@ +/* + Copyright 2015-2016 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#include "stdafx.h" diff --git a/lib/libZRColaUI/src/stdafx.h b/lib/libZRColaUI/src/stdafx.h new file mode 100644 index 0000000..6a78f14 --- /dev/null +++ b/lib/libZRColaUI/src/stdafx.h @@ -0,0 +1,22 @@ +/* + Copyright 2015-2016 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#pragma once + +#include "../../../include/zrcola.h"