diff options
-rw-r--r-- | App/App.ico (renamed from Source/Source.ico) | bin | 46227 -> 46227 bytes | |||
-rw-r--r-- | App/App.vcxproj | 186 | ||||
-rw-r--r-- | App/App.vcxproj.filters | 43 | ||||
-rw-r--r-- | App/Main.cpp (renamed from Source/Main.cpp) | 0 | ||||
-rw-r--r-- | App/Version.h (renamed from Source/Version.h) | 0 | ||||
-rw-r--r-- | App/Version.rc (renamed from Source/Version.rc) | 0 | ||||
-rw-r--r-- | App/small.ico (renamed from Source/small.ico) | bin | 46227 -> 46227 bytes | |||
-rw-r--r-- | Source/Panel.cpp | 1 | ||||
-rw-r--r-- | Source/Panel.h | 1 | ||||
-rw-r--r-- | Source/Random.cpp | 1 | ||||
-rw-r--r-- | Source/Source.vcxproj | 111 | ||||
-rw-r--r-- | Source/Source.vcxproj.filters | 38 | ||||
-rw-r--r-- | Test/Foo.cpp | 11 | ||||
-rw-r--r-- | Test/OrderingTests.cpp | 7 | ||||
-rw-r--r-- | Test/Test.vcxproj | 27 | ||||
-rw-r--r-- | WitnessRandomizer.sln | 44 |
16 files changed, 344 insertions, 126 deletions
diff --git a/Source/Source.ico b/App/App.ico index b3ec03b..b3ec03b 100644 --- a/Source/Source.ico +++ b/App/App.ico | |||
Binary files differ | |||
diff --git a/App/App.vcxproj b/App/App.vcxproj new file mode 100644 index 0000000..b17f7a6 --- /dev/null +++ b/App/App.vcxproj | |||
@@ -0,0 +1,186 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
3 | <ItemGroup Label="ProjectConfigurations"> | ||
4 | <ProjectConfiguration Include="Debug|Win32"> | ||
5 | <Configuration>Debug</Configuration> | ||
6 | <Platform>Win32</Platform> | ||
7 | </ProjectConfiguration> | ||
8 | <ProjectConfiguration Include="Release|Win32"> | ||
9 | <Configuration>Release</Configuration> | ||
10 | <Platform>Win32</Platform> | ||
11 | </ProjectConfiguration> | ||
12 | <ProjectConfiguration Include="Debug|x64"> | ||
13 | <Configuration>Debug</Configuration> | ||
14 | <Platform>x64</Platform> | ||
15 | </ProjectConfiguration> | ||
16 | <ProjectConfiguration Include="Release|x64"> | ||
17 | <Configuration>Release</Configuration> | ||
18 | <Platform>x64</Platform> | ||
19 | </ProjectConfiguration> | ||
20 | </ItemGroup> | ||
21 | <PropertyGroup Label="Globals"> | ||
22 | <VCProjectVersion>15.0</VCProjectVersion> | ||
23 | <ProjectGuid>{CED79182-F36B-4D07-AD0E-249C15BFAD73}</ProjectGuid> | ||
24 | <Keyword>Win32Proj</Keyword> | ||
25 | <RootNamespace>App</RootNamespace> | ||
26 | <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> | ||
27 | <ProjectName>App</ProjectName> | ||
28 | </PropertyGroup> | ||
29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
30 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
31 | <ConfigurationType>Application</ConfigurationType> | ||
32 | <UseDebugLibraries>true</UseDebugLibraries> | ||
33 | <PlatformToolset>v141</PlatformToolset> | ||
34 | <CharacterSet>Unicode</CharacterSet> | ||
35 | </PropertyGroup> | ||
36 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
37 | <ConfigurationType>Application</ConfigurationType> | ||
38 | <UseDebugLibraries>false</UseDebugLibraries> | ||
39 | <PlatformToolset>v141</PlatformToolset> | ||
40 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
41 | <CharacterSet>Unicode</CharacterSet> | ||
42 | </PropertyGroup> | ||
43 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
44 | <ConfigurationType>Application</ConfigurationType> | ||
45 | <UseDebugLibraries>true</UseDebugLibraries> | ||
46 | <PlatformToolset>v141</PlatformToolset> | ||
47 | <CharacterSet>Unicode</CharacterSet> | ||
48 | </PropertyGroup> | ||
49 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
50 | <ConfigurationType>Application</ConfigurationType> | ||
51 | <UseDebugLibraries>false</UseDebugLibraries> | ||
52 | <PlatformToolset>v141</PlatformToolset> | ||
53 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
54 | <CharacterSet>Unicode</CharacterSet> | ||
55 | </PropertyGroup> | ||
56 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
57 | <ImportGroup Label="ExtensionSettings"> | ||
58 | </ImportGroup> | ||
59 | <ImportGroup Label="Shared"> | ||
60 | </ImportGroup> | ||
61 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
62 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
63 | </ImportGroup> | ||
64 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
65 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
66 | </ImportGroup> | ||
67 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
68 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
69 | </ImportGroup> | ||
70 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
71 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
72 | </ImportGroup> | ||
73 | <PropertyGroup Label="UserMacros" /> | ||
74 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
75 | <LinkIncremental>true</LinkIncremental> | ||
76 | </PropertyGroup> | ||
77 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
78 | <LinkIncremental>true</LinkIncremental> | ||
79 | </PropertyGroup> | ||
80 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
81 | <LinkIncremental>false</LinkIncremental> | ||
82 | </PropertyGroup> | ||
83 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
84 | <LinkIncremental>false</LinkIncremental> | ||
85 | <TargetName>WitnessRandomizer</TargetName> | ||
86 | </PropertyGroup> | ||
87 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
88 | <ClCompile> | ||
89 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
90 | <WarningLevel>Level3</WarningLevel> | ||
91 | <Optimization>Disabled</Optimization> | ||
92 | <SDLCheck>true</SDLCheck> | ||
93 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
94 | <ConformanceMode>true</ConformanceMode> | ||
95 | <TreatWarningAsError>true</TreatWarningAsError> | ||
96 | <LanguageStandard>stdcpp17</LanguageStandard> | ||
97 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
98 | </ClCompile> | ||
99 | <Link> | ||
100 | <SubSystem>Windows</SubSystem> | ||
101 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
102 | </Link> | ||
103 | </ItemDefinitionGroup> | ||
104 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
105 | <ClCompile> | ||
106 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
107 | <WarningLevel>Level2</WarningLevel> | ||
108 | <Optimization>Disabled</Optimization> | ||
109 | <SDLCheck>true</SDLCheck> | ||
110 | <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
111 | <ConformanceMode>true</ConformanceMode> | ||
112 | <TreatWarningAsError>true</TreatWarningAsError> | ||
113 | <LanguageStandard>stdcpp17</LanguageStandard> | ||
114 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
115 | <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
116 | </ClCompile> | ||
117 | <Link> | ||
118 | <SubSystem>Windows</SubSystem> | ||
119 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
120 | </Link> | ||
121 | </ItemDefinitionGroup> | ||
122 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
123 | <ClCompile> | ||
124 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
125 | <WarningLevel>Level3</WarningLevel> | ||
126 | <Optimization>MaxSpeed</Optimization> | ||
127 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
128 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
129 | <SDLCheck>true</SDLCheck> | ||
130 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
131 | <ConformanceMode>true</ConformanceMode> | ||
132 | <TreatWarningAsError>true</TreatWarningAsError> | ||
133 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||
134 | <LanguageStandard>stdcpp17</LanguageStandard> | ||
135 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
136 | </ClCompile> | ||
137 | <Link> | ||
138 | <SubSystem>Windows</SubSystem> | ||
139 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
140 | <OptimizeReferences>true</OptimizeReferences> | ||
141 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
142 | </Link> | ||
143 | </ItemDefinitionGroup> | ||
144 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
145 | <ClCompile> | ||
146 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | ||
147 | <WarningLevel>Level2</WarningLevel> | ||
148 | <Optimization>MaxSpeed</Optimization> | ||
149 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
150 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
151 | <SDLCheck>true</SDLCheck> | ||
152 | <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
153 | <ConformanceMode>true</ConformanceMode> | ||
154 | <TreatWarningAsError>true</TreatWarningAsError> | ||
155 | <LanguageStandard>stdcpp17</LanguageStandard> | ||
156 | <DebugInformationFormat>None</DebugInformationFormat> | ||
157 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
158 | <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
159 | </ClCompile> | ||
160 | <Link> | ||
161 | <SubSystem>Windows</SubSystem> | ||
162 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
163 | <OptimizeReferences>true</OptimizeReferences> | ||
164 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
165 | </Link> | ||
166 | </ItemDefinitionGroup> | ||
167 | <ItemGroup> | ||
168 | <ClInclude Include="Version.h" /> | ||
169 | </ItemGroup> | ||
170 | <ItemGroup> | ||
171 | <ClCompile Include="Main.cpp" /> | ||
172 | </ItemGroup> | ||
173 | <ItemGroup> | ||
174 | <ResourceCompile Include="Version.rc" /> | ||
175 | </ItemGroup> | ||
176 | <ItemGroup> | ||
177 | <Image Include="small.ico" /> | ||
178 | <Image Include="App.ico" /> | ||
179 | </ItemGroup> | ||
180 | <ItemGroup> | ||
181 | <None Include="App.aps" /> | ||
182 | </ItemGroup> | ||
183 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
184 | <ImportGroup Label="ExtensionTargets"> | ||
185 | </ImportGroup> | ||
186 | </Project> \ No newline at end of file | ||
diff --git a/App/App.vcxproj.filters b/App/App.vcxproj.filters new file mode 100644 index 0000000..26b3d34 --- /dev/null +++ b/App/App.vcxproj.filters | |||
@@ -0,0 +1,43 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
3 | <ItemGroup> | ||
4 | <Filter Include="Source Files"> | ||
5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | ||
6 | <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> | ||
7 | </Filter> | ||
8 | <Filter Include="Header Files"> | ||
9 | <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> | ||
10 | <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> | ||
11 | </Filter> | ||
12 | <Filter Include="Resource Files"> | ||
13 | <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> | ||
14 | <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> | ||
15 | </Filter> | ||
16 | </ItemGroup> | ||
17 | <ItemGroup> | ||
18 | <ClInclude Include="Version.h"> | ||
19 | <Filter>Header Files</Filter> | ||
20 | </ClInclude> | ||
21 | </ItemGroup> | ||
22 | <ItemGroup> | ||
23 | <ClCompile Include="Main.cpp"> | ||
24 | <Filter>Source Files</Filter> | ||
25 | </ClCompile> | ||
26 | </ItemGroup> | ||
27 | <ItemGroup> | ||
28 | <ResourceCompile Include="Version.rc"> | ||
29 | <Filter>Resource Files</Filter> | ||
30 | </ResourceCompile> | ||
31 | </ItemGroup> | ||
32 | <ItemGroup> | ||
33 | <Image Include="small.ico"> | ||
34 | <Filter>Resource Files</Filter> | ||
35 | </Image> | ||
36 | <Image Include="App.ico"> | ||
37 | <Filter>Resource Files</Filter> | ||
38 | </Image> | ||
39 | </ItemGroup> | ||
40 | <ItemGroup> | ||
41 | <None Include="App.aps" /> | ||
42 | </ItemGroup> | ||
43 | </Project> \ No newline at end of file | ||
diff --git a/Source/Main.cpp b/App/Main.cpp index ce0e550..ce0e550 100644 --- a/Source/Main.cpp +++ b/App/Main.cpp | |||
diff --git a/Source/Version.h b/App/Version.h index 05696d6..05696d6 100644 --- a/Source/Version.h +++ b/App/Version.h | |||
diff --git a/Source/Version.rc b/App/Version.rc index 9b90884..9b90884 100644 --- a/Source/Version.rc +++ b/App/Version.rc | |||
diff --git a/Source/small.ico b/App/small.ico index b3ec03b..b3ec03b 100644 --- a/Source/small.ico +++ b/App/small.ico | |||
Binary files differ | |||
diff --git a/Source/Panel.cpp b/Source/Panel.cpp index 5465bef..14f803c 100644 --- a/Source/Panel.cpp +++ b/Source/Panel.cpp | |||
@@ -1,5 +1,6 @@ | |||
1 | #include "Panel.h" | 1 | #include "Panel.h" |
2 | #include "Random.h" | 2 | #include "Random.h" |
3 | #include "Memory.h" | ||
3 | #include <sstream> | 4 | #include <sstream> |
4 | 5 | ||
5 | template <class T> | 6 | template <class T> |
diff --git a/Source/Panel.h b/Source/Panel.h index 4982f17..4f3ab11 100644 --- a/Source/Panel.h +++ b/Source/Panel.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | #include "json.hpp" | 2 | #include "json.hpp" |
3 | #include "RandomizerCore.h" | 3 | #include "RandomizerCore.h" |
4 | #include "Memory.h" | ||
4 | 5 | ||
5 | class Decoration | 6 | class Decoration |
6 | { | 7 | { |
diff --git a/Source/Random.cpp b/Source/Random.cpp index cc3eb6c..c921e58 100644 --- a/Source/Random.cpp +++ b/Source/Random.cpp | |||
@@ -1,5 +1,4 @@ | |||
1 | #include <chrono> | 1 | #include <chrono> |
2 | |||
3 | #include "Random.h" | 2 | #include "Random.h" |
4 | 3 | ||
5 | int Random::s_seed = time(nullptr); // Seed from the time in milliseconds | 4 | int Random::s_seed = time(nullptr); // Seed from the time in milliseconds |
diff --git a/Source/Source.vcxproj b/Source/Source.vcxproj index 4319a91..d140781 100644 --- a/Source/Source.vcxproj +++ b/Source/Source.vcxproj | |||
@@ -18,35 +18,51 @@ | |||
18 | <Platform>x64</Platform> | 18 | <Platform>x64</Platform> |
19 | </ProjectConfiguration> | 19 | </ProjectConfiguration> |
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | <ItemGroup> | ||
22 | <ClInclude Include="json.hpp" /> | ||
23 | <ClInclude Include="Memory.h" /> | ||
24 | <ClInclude Include="Panel.h" /> | ||
25 | <ClInclude Include="Panels.h" /> | ||
26 | <ClInclude Include="Random.h" /> | ||
27 | <ClInclude Include="Randomizer.h" /> | ||
28 | <ClInclude Include="RandomizerCore.h" /> | ||
29 | </ItemGroup> | ||
30 | <ItemGroup> | ||
31 | <ClCompile Include="Memory.cpp" /> | ||
32 | <ClCompile Include="Panel.cpp" /> | ||
33 | <ClCompile Include="Random.cpp" /> | ||
34 | <ClCompile Include="Randomizer.cpp" /> | ||
35 | <ClCompile Include="RandomizerCore.cpp" /> | ||
36 | </ItemGroup> | ||
21 | <PropertyGroup Label="Globals"> | 37 | <PropertyGroup Label="Globals"> |
22 | <VCProjectVersion>15.0</VCProjectVersion> | 38 | <VCProjectVersion>15.0</VCProjectVersion> |
23 | <ProjectGuid>{CED79182-F36B-4D07-AD0E-249C15BFAD73}</ProjectGuid> | 39 | <ProjectGuid>{5C019BEA-E0B4-4215-825F-6A228CD3AE27}</ProjectGuid> |
24 | <Keyword>Win32Proj</Keyword> | 40 | <Keyword>Win32Proj</Keyword> |
25 | <RootNamespace>Source</RootNamespace> | 41 | <RootNamespace>Source</RootNamespace> |
26 | <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> | 42 | <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> |
27 | </PropertyGroup> | 43 | </PropertyGroup> |
28 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
29 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | 45 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
30 | <ConfigurationType>Application</ConfigurationType> | 46 | <ConfigurationType>StaticLibrary</ConfigurationType> |
31 | <UseDebugLibraries>true</UseDebugLibraries> | 47 | <UseDebugLibraries>true</UseDebugLibraries> |
32 | <PlatformToolset>v141</PlatformToolset> | 48 | <PlatformToolset>v141</PlatformToolset> |
33 | <CharacterSet>Unicode</CharacterSet> | 49 | <CharacterSet>Unicode</CharacterSet> |
34 | </PropertyGroup> | 50 | </PropertyGroup> |
35 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 51 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
36 | <ConfigurationType>Application</ConfigurationType> | 52 | <ConfigurationType>StaticLibrary</ConfigurationType> |
37 | <UseDebugLibraries>false</UseDebugLibraries> | 53 | <UseDebugLibraries>false</UseDebugLibraries> |
38 | <PlatformToolset>v141</PlatformToolset> | 54 | <PlatformToolset>v141</PlatformToolset> |
39 | <WholeProgramOptimization>true</WholeProgramOptimization> | 55 | <WholeProgramOptimization>true</WholeProgramOptimization> |
40 | <CharacterSet>Unicode</CharacterSet> | 56 | <CharacterSet>Unicode</CharacterSet> |
41 | </PropertyGroup> | 57 | </PropertyGroup> |
42 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | 58 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
43 | <ConfigurationType>Application</ConfigurationType> | 59 | <ConfigurationType>StaticLibrary</ConfigurationType> |
44 | <UseDebugLibraries>true</UseDebugLibraries> | 60 | <UseDebugLibraries>true</UseDebugLibraries> |
45 | <PlatformToolset>v141</PlatformToolset> | 61 | <PlatformToolset>v141</PlatformToolset> |
46 | <CharacterSet>Unicode</CharacterSet> | 62 | <CharacterSet>Unicode</CharacterSet> |
47 | </PropertyGroup> | 63 | </PropertyGroup> |
48 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | 64 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
49 | <ConfigurationType>Application</ConfigurationType> | 65 | <ConfigurationType>StaticLibrary</ConfigurationType> |
50 | <UseDebugLibraries>false</UseDebugLibraries> | 66 | <UseDebugLibraries>false</UseDebugLibraries> |
51 | <PlatformToolset>v141</PlatformToolset> | 67 | <PlatformToolset>v141</PlatformToolset> |
52 | <WholeProgramOptimization>true</WholeProgramOptimization> | 68 | <WholeProgramOptimization>true</WholeProgramOptimization> |
@@ -70,6 +86,9 @@ | |||
70 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 86 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
71 | </ImportGroup> | 87 | </ImportGroup> |
72 | <PropertyGroup Label="UserMacros" /> | 88 | <PropertyGroup Label="UserMacros" /> |
89 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
90 | <LinkIncremental>false</LinkIncremental> | ||
91 | </PropertyGroup> | ||
73 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | 92 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
74 | <LinkIncremental>true</LinkIncremental> | 93 | <LinkIncremental>true</LinkIncremental> |
75 | </PropertyGroup> | 94 | </PropertyGroup> |
@@ -79,80 +98,66 @@ | |||
79 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 98 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
80 | <LinkIncremental>false</LinkIncremental> | 99 | <LinkIncremental>false</LinkIncremental> |
81 | </PropertyGroup> | 100 | </PropertyGroup> |
82 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 101 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
83 | <LinkIncremental>false</LinkIncremental> | ||
84 | <TargetName>WitnessRandomizer</TargetName> | ||
85 | </PropertyGroup> | ||
86 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
87 | <ClCompile> | 102 | <ClCompile> |
88 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | 103 | <PrecompiledHeader>NotUsing</PrecompiledHeader> |
89 | <WarningLevel>Level3</WarningLevel> | 104 | <WarningLevel>Level2</WarningLevel> |
90 | <Optimization>Disabled</Optimization> | 105 | <Optimization>MaxSpeed</Optimization> |
106 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
107 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
91 | <SDLCheck>true</SDLCheck> | 108 | <SDLCheck>true</SDLCheck> |
92 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 109 | <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
93 | <ConformanceMode>true</ConformanceMode> | 110 | <ConformanceMode>true</ConformanceMode> |
94 | <TreatWarningAsError>true</TreatWarningAsError> | ||
95 | <LanguageStandard>stdcpp17</LanguageStandard> | 111 | <LanguageStandard>stdcpp17</LanguageStandard> |
96 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | 112 | <TreatWarningAsError>true</TreatWarningAsError> |
97 | </ClCompile> | 113 | </ClCompile> |
98 | <Link> | 114 | <Link> |
99 | <SubSystem>Windows</SubSystem> | 115 | <SubSystem>Windows</SubSystem> |
116 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
117 | <OptimizeReferences>true</OptimizeReferences> | ||
100 | <GenerateDebugInformation>true</GenerateDebugInformation> | 118 | <GenerateDebugInformation>true</GenerateDebugInformation> |
101 | </Link> | 119 | </Link> |
102 | </ItemDefinitionGroup> | 120 | </ItemDefinitionGroup> |
103 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 121 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
104 | <ClCompile> | 122 | <ClCompile> |
105 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | 123 | <PrecompiledHeader>Use</PrecompiledHeader> |
106 | <WarningLevel>Level2</WarningLevel> | 124 | <WarningLevel>Level3</WarningLevel> |
107 | <Optimization>Disabled</Optimization> | 125 | <Optimization>Disabled</Optimization> |
108 | <SDLCheck>true</SDLCheck> | 126 | <SDLCheck>true</SDLCheck> |
109 | <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 127 | <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
110 | <ConformanceMode>true</ConformanceMode> | 128 | <ConformanceMode>true</ConformanceMode> |
111 | <TreatWarningAsError>true</TreatWarningAsError> | ||
112 | <LanguageStandard>stdcpp17</LanguageStandard> | ||
113 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
114 | </ClCompile> | 129 | </ClCompile> |
115 | <Link> | 130 | <Link> |
116 | <SubSystem>Windows</SubSystem> | 131 | <SubSystem>Windows</SubSystem> |
117 | <GenerateDebugInformation>true</GenerateDebugInformation> | 132 | <GenerateDebugInformation>true</GenerateDebugInformation> |
118 | </Link> | 133 | </Link> |
119 | </ItemDefinitionGroup> | 134 | </ItemDefinitionGroup> |
120 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 135 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
121 | <ClCompile> | 136 | <ClCompile> |
122 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | 137 | <PrecompiledHeader>NotUsing</PrecompiledHeader> |
123 | <WarningLevel>Level3</WarningLevel> | 138 | <WarningLevel>Level2</WarningLevel> |
124 | <Optimization>MaxSpeed</Optimization> | 139 | <Optimization>Disabled</Optimization> |
125 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
126 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
127 | <SDLCheck>true</SDLCheck> | 140 | <SDLCheck>true</SDLCheck> |
128 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 141 | <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
129 | <ConformanceMode>true</ConformanceMode> | 142 | <ConformanceMode>true</ConformanceMode> |
130 | <TreatWarningAsError>true</TreatWarningAsError> | ||
131 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||
132 | <LanguageStandard>stdcpp17</LanguageStandard> | 143 | <LanguageStandard>stdcpp17</LanguageStandard> |
133 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 144 | <TreatWarningAsError>true</TreatWarningAsError> |
134 | </ClCompile> | 145 | </ClCompile> |
135 | <Link> | 146 | <Link> |
136 | <SubSystem>Windows</SubSystem> | 147 | <SubSystem>Windows</SubSystem> |
137 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
138 | <OptimizeReferences>true</OptimizeReferences> | ||
139 | <GenerateDebugInformation>true</GenerateDebugInformation> | 148 | <GenerateDebugInformation>true</GenerateDebugInformation> |
140 | </Link> | 149 | </Link> |
141 | </ItemDefinitionGroup> | 150 | </ItemDefinitionGroup> |
142 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 151 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
143 | <ClCompile> | 152 | <ClCompile> |
144 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | 153 | <PrecompiledHeader>Use</PrecompiledHeader> |
145 | <WarningLevel>Level2</WarningLevel> | 154 | <WarningLevel>Level3</WarningLevel> |
146 | <Optimization>MaxSpeed</Optimization> | 155 | <Optimization>MaxSpeed</Optimization> |
147 | <FunctionLevelLinking>true</FunctionLevelLinking> | 156 | <FunctionLevelLinking>true</FunctionLevelLinking> |
148 | <IntrinsicFunctions>true</IntrinsicFunctions> | 157 | <IntrinsicFunctions>true</IntrinsicFunctions> |
149 | <SDLCheck>true</SDLCheck> | 158 | <SDLCheck>true</SDLCheck> |
150 | <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 159 | <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
151 | <ConformanceMode>true</ConformanceMode> | 160 | <ConformanceMode>true</ConformanceMode> |
152 | <TreatWarningAsError>true</TreatWarningAsError> | ||
153 | <LanguageStandard>stdcpp17</LanguageStandard> | ||
154 | <DebugInformationFormat>None</DebugInformationFormat> | ||
155 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
156 | </ClCompile> | 161 | </ClCompile> |
157 | <Link> | 162 | <Link> |
158 | <SubSystem>Windows</SubSystem> | 163 | <SubSystem>Windows</SubSystem> |
@@ -161,30 +166,6 @@ | |||
161 | <GenerateDebugInformation>true</GenerateDebugInformation> | 166 | <GenerateDebugInformation>true</GenerateDebugInformation> |
162 | </Link> | 167 | </Link> |
163 | </ItemDefinitionGroup> | 168 | </ItemDefinitionGroup> |
164 | <ItemGroup> | ||
165 | <ClInclude Include="Memory.h" /> | ||
166 | <ClInclude Include="Panel.h" /> | ||
167 | <ClInclude Include="Panels.h" /> | ||
168 | <ClInclude Include="Random.h" /> | ||
169 | <ClInclude Include="Randomizer.h" /> | ||
170 | <ClInclude Include="RandomizerCore.h" /> | ||
171 | <ClInclude Include="Version.h" /> | ||
172 | </ItemGroup> | ||
173 | <ItemGroup> | ||
174 | <ClCompile Include="Main.cpp" /> | ||
175 | <ClCompile Include="Memory.cpp" /> | ||
176 | <ClCompile Include="Panel.cpp" /> | ||
177 | <ClCompile Include="Random.cpp" /> | ||
178 | <ClCompile Include="Randomizer.cpp" /> | ||
179 | <ClCompile Include="RandomizerCore.cpp" /> | ||
180 | </ItemGroup> | ||
181 | <ItemGroup> | ||
182 | <ResourceCompile Include="Version.rc" /> | ||
183 | </ItemGroup> | ||
184 | <ItemGroup> | ||
185 | <Image Include="small.ico" /> | ||
186 | <Image Include="Source.ico" /> | ||
187 | </ItemGroup> | ||
188 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 169 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
189 | <ImportGroup Label="ExtensionTargets"> | 170 | <ImportGroup Label="ExtensionTargets"> |
190 | </ImportGroup> | 171 | </ImportGroup> |
diff --git a/Source/Source.vcxproj.filters b/Source/Source.vcxproj.filters index f480c6c..fe9204f 100644 --- a/Source/Source.vcxproj.filters +++ b/Source/Source.vcxproj.filters | |||
@@ -15,59 +15,43 @@ | |||
15 | </Filter> | 15 | </Filter> |
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | <ItemGroup> | 17 | <ItemGroup> |
18 | <ClInclude Include="Memory.h"> | 18 | <ClInclude Include="json.hpp"> |
19 | <Filter>Header Files</Filter> | 19 | <Filter>Header Files</Filter> |
20 | </ClInclude> | 20 | </ClInclude> |
21 | <ClInclude Include="Panels.h"> | 21 | <ClInclude Include="Memory.h"> |
22 | <Filter>Header Files</Filter> | 22 | <Filter>Header Files</Filter> |
23 | </ClInclude> | 23 | </ClInclude> |
24 | <ClInclude Include="Randomizer.h"> | 24 | <ClInclude Include="Panel.h"> |
25 | <Filter>Header Files</Filter> | 25 | <Filter>Header Files</Filter> |
26 | </ClInclude> | 26 | </ClInclude> |
27 | <ClInclude Include="RandomizerCore.h"> | 27 | <ClInclude Include="Panels.h"> |
28 | <Filter>Header Files</Filter> | 28 | <Filter>Header Files</Filter> |
29 | </ClInclude> | 29 | </ClInclude> |
30 | <ClInclude Include="Version.h"> | 30 | <ClInclude Include="Random.h"> |
31 | <Filter>Header Files</Filter> | 31 | <Filter>Header Files</Filter> |
32 | </ClInclude> | 32 | </ClInclude> |
33 | <ClInclude Include="Random.h"> | 33 | <ClInclude Include="Randomizer.h"> |
34 | <Filter>Header Files</Filter> | 34 | <Filter>Header Files</Filter> |
35 | </ClInclude> | 35 | </ClInclude> |
36 | <ClInclude Include="Panel.h"> | 36 | <ClInclude Include="RandomizerCore.h"> |
37 | <Filter>Header Files</Filter> | 37 | <Filter>Header Files</Filter> |
38 | </ClInclude> | 38 | </ClInclude> |
39 | </ItemGroup> | 39 | </ItemGroup> |
40 | <ItemGroup> | 40 | <ItemGroup> |
41 | <ClCompile Include="Main.cpp"> | ||
42 | <Filter>Source Files</Filter> | ||
43 | </ClCompile> | ||
44 | <ClCompile Include="Memory.cpp"> | 41 | <ClCompile Include="Memory.cpp"> |
45 | <Filter>Source Files</Filter> | 42 | <Filter>Source Files</Filter> |
46 | </ClCompile> | 43 | </ClCompile> |
47 | <ClCompile Include="Randomizer.cpp"> | 44 | <ClCompile Include="Panel.cpp"> |
48 | <Filter>Source Files</Filter> | 45 | <Filter>Source Files</Filter> |
49 | </ClCompile> | 46 | </ClCompile> |
50 | <ClCompile Include="RandomizerCore.cpp"> | 47 | <ClCompile Include="Random.cpp"> |
51 | <Filter>Source Files</Filter> | 48 | <Filter>Source Files</Filter> |
52 | </ClCompile> | 49 | </ClCompile> |
53 | <ClCompile Include="Panel.cpp"> | 50 | <ClCompile Include="Randomizer.cpp"> |
54 | <Filter>Source Files</Filter> | 51 | <Filter>Source Files</Filter> |
55 | </ClCompile> | 52 | </ClCompile> |
56 | <ClCompile Include="Random.cpp"> | 53 | <ClCompile Include="RandomizerCore.cpp"> |
57 | <Filter>Source Files</Filter> | 54 | <Filter>Source Files</Filter> |
58 | </ClCompile> | 55 | </ClCompile> |
59 | </ItemGroup> | 56 | </ItemGroup> |
60 | <ItemGroup> | ||
61 | <ResourceCompile Include="Version.rc"> | ||
62 | <Filter>Resource Files</Filter> | ||
63 | </ResourceCompile> | ||
64 | </ItemGroup> | ||
65 | <ItemGroup> | ||
66 | <Image Include="small.ico"> | ||
67 | <Filter>Resource Files</Filter> | ||
68 | </Image> | ||
69 | <Image Include="Source.ico"> | ||
70 | <Filter>Resource Files</Filter> | ||
71 | </Image> | ||
72 | </ItemGroup> | ||
73 | </Project> \ No newline at end of file | 57 | </Project> \ No newline at end of file |
diff --git a/Test/Foo.cpp b/Test/Foo.cpp new file mode 100644 index 0000000..d9d155e --- /dev/null +++ b/Test/Foo.cpp | |||
@@ -0,0 +1,11 @@ | |||
1 | #include "gtest/gtest.h" | ||
2 | #include "Random.h" | ||
3 | |||
4 | TEST(Foo, Bar) { | ||
5 | int random1 = Random::RandInt(0, 1 << 30); | ||
6 | int random2 = Random::RandInt(0, 1 << 30); | ||
7 | ASSERT_NE(random1, random2); | ||
8 | int random3 = Random::RandInt(random1, random2); | ||
9 | ASSERT_GE(random3, random1); | ||
10 | ASSERT_LT(random3, random2); | ||
11 | } | ||
diff --git a/Test/OrderingTests.cpp b/Test/OrderingTests.cpp deleted file mode 100644 index 6549be7..0000000 --- a/Test/OrderingTests.cpp +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #include "gtest/gtest.h" | ||
2 | #include "Randomizer.h" | ||
3 | #include "Memory.h" | ||
4 | |||
5 | TEST(OrderingTests, TestJungleOrder) { | ||
6 | Randomizer _randomizer; | ||
7 | } | ||
diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj index aaa311c..36b192a 100644 --- a/Test/Test.vcxproj +++ b/Test/Test.vcxproj | |||
@@ -19,7 +19,7 @@ | |||
19 | </ProjectConfiguration> | 19 | </ProjectConfiguration> |
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | <PropertyGroup Label="Globals"> | 21 | <PropertyGroup Label="Globals"> |
22 | <ProjectGuid>{98bc35b9-ee1a-4d77-85f2-adaa72db16f7}</ProjectGuid> | 22 | <ProjectGuid>{2208ee21-5366-4042-89d6-1a3c4bd79ad4}</ProjectGuid> |
23 | <Keyword>Win32Proj</Keyword> | 23 | <Keyword>Win32Proj</Keyword> |
24 | <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> | 24 | <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> |
25 | <ConfigurationType>Application</ConfigurationType> | 25 | <ConfigurationType>Application</ConfigurationType> |
@@ -33,22 +33,22 @@ | |||
33 | <ImportGroup Label="PropertySheets" /> | 33 | <ImportGroup Label="PropertySheets" /> |
34 | <PropertyGroup Label="UserMacros" /> | 34 | <PropertyGroup Label="UserMacros" /> |
35 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 35 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
36 | <IncludePath>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;$(IncludePath)</IncludePath> | 36 | <IncludePath>$(IncludePath)</IncludePath> |
37 | </PropertyGroup> | 37 | </PropertyGroup> |
38 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 38 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
39 | <IncludePath>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;$(IncludePath)</IncludePath> | 39 | <IncludePath>$(IncludePath)</IncludePath> |
40 | </PropertyGroup> | 40 | </PropertyGroup> |
41 | <ItemGroup> | 41 | <ItemGroup> |
42 | <ClCompile Include="OrderingTests.cpp" /> | ||
43 | </ItemGroup> | ||
44 | <ItemGroup> | ||
45 | <ProjectReference Include="..\Source\Source.vcxproj"> | 42 | <ProjectReference Include="..\Source\Source.vcxproj"> |
46 | <Project>{ced79182-f36b-4d07-ad0e-249c15bfad73}</Project> | 43 | <Project>{5c019bea-e0b4-4215-825f-6a228cd3ae27}</Project> |
47 | </ProjectReference> | 44 | </ProjectReference> |
48 | </ItemGroup> | 45 | </ItemGroup> |
49 | <ItemGroup> | 46 | <ItemGroup> |
50 | <None Include="packages.config" /> | 47 | <None Include="packages.config" /> |
51 | </ItemGroup> | 48 | </ItemGroup> |
49 | <ItemGroup> | ||
50 | <ClCompile Include="Foo.cpp" /> | ||
51 | </ItemGroup> | ||
52 | <ItemDefinitionGroup /> | 52 | <ItemDefinitionGroup /> |
53 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 53 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
54 | <ImportGroup Label="ExtensionTargets"> | 54 | <ImportGroup Label="ExtensionTargets"> |
@@ -72,14 +72,17 @@ | |||
72 | </ItemDefinitionGroup> | 72 | </ItemDefinitionGroup> |
73 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 73 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
74 | <ClCompile> | 74 | <ClCompile> |
75 | <PrecompiledHeader>Use</PrecompiledHeader> | 75 | <PrecompiledHeader>NotUsing</PrecompiledHeader> |
76 | <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> | 76 | <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> |
77 | <Optimization>Disabled</Optimization> | 77 | <Optimization>Disabled</Optimization> |
78 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 78 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
79 | <MinimalRebuild>true</MinimalRebuild> | 79 | <MinimalRebuild>true</MinimalRebuild> |
80 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 80 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
81 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 81 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
82 | <WarningLevel>Level3</WarningLevel> | 82 | <WarningLevel>Level2</WarningLevel> |
83 | <DisableSpecificWarnings>4996</DisableSpecificWarnings> | ||
84 | <TreatWarningAsError>true</TreatWarningAsError> | ||
85 | <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
83 | </ClCompile> | 86 | </ClCompile> |
84 | <Link> | 87 | <Link> |
85 | <GenerateDebugInformation>true</GenerateDebugInformation> | 88 | <GenerateDebugInformation>true</GenerateDebugInformation> |
@@ -108,11 +111,11 @@ | |||
108 | <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> | 111 | <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> |
109 | <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 112 | <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
110 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 113 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
111 | <WarningLevel>Level3</WarningLevel> | 114 | <WarningLevel>Level2</WarningLevel> |
112 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 115 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
113 | <LanguageStandard> | ||
114 | </LanguageStandard> | ||
115 | <DisableSpecificWarnings>4996</DisableSpecificWarnings> | 116 | <DisableSpecificWarnings>4996</DisableSpecificWarnings> |
117 | <TreatWarningAsError>true</TreatWarningAsError> | ||
118 | <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
116 | </ClCompile> | 119 | </ClCompile> |
117 | <Link> | 120 | <Link> |
118 | <GenerateDebugInformation>true</GenerateDebugInformation> | 121 | <GenerateDebugInformation>true</GenerateDebugInformation> |
diff --git a/WitnessRandomizer.sln b/WitnessRandomizer.sln index 7d6b1c2..a9d1f7e 100644 --- a/WitnessRandomizer.sln +++ b/WitnessRandomizer.sln | |||
@@ -3,11 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
3 | # Visual Studio 15 | 3 | # Visual Studio 15 |
4 | VisualStudioVersion = 15.0.28010.2048 | 4 | VisualStudioVersion = 15.0.28010.2048 |
5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{CED79182-F36B-4D07-AD0E-249C15BFAD73}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{CED79182-F36B-4D07-AD0E-249C15BFAD73}" |
7 | ProjectSection(ProjectDependencies) = postProject | ||
8 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27} = {5C019BEA-E0B4-4215-825F-6A228CD3AE27} | ||
9 | EndProjectSection | ||
7 | EndProject | 10 | EndProject |
8 | Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}" | 11 | Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}" |
12 | ProjectSection(ProjectDependencies) = postProject | ||
13 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27} = {5C019BEA-E0B4-4215-825F-6A228CD3AE27} | ||
14 | EndProjectSection | ||
9 | EndProject | 15 | EndProject |
10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}" | 16 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{5C019BEA-E0B4-4215-825F-6A228CD3AE27}" |
17 | EndProject | ||
18 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{2208EE21-5366-4042-89D6-1A3C4BD79AD4}" | ||
11 | EndProject | 19 | EndProject |
12 | Global | 20 | Global |
13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 21 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
@@ -21,24 +29,32 @@ Global | |||
21 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x64.Build.0 = Debug|x64 | 29 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x64.Build.0 = Debug|x64 |
22 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.ActiveCfg = Release|x64 | 30 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.ActiveCfg = Release|x64 |
23 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.Build.0 = Release|x64 | 31 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.Build.0 = Release|x64 |
24 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.ActiveCfg = Release|x64 | 32 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.ActiveCfg = Debug|x64 |
25 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.Build.0 = Release|x64 | 33 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.Build.0 = Debug|x64 |
26 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.ActiveCfg = Release|Win32 | 34 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.ActiveCfg = Release|Win32 |
27 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.Build.0 = Release|Win32 | 35 | {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.Build.0 = Release|Win32 |
28 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x64.ActiveCfg = Debug | 36 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x64.ActiveCfg = Debug |
29 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x64.Build.0 = Debug | 37 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x64.Build.0 = Debug |
30 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x86.ActiveCfg = Release | 38 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x86.ActiveCfg = Release |
31 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x64.ActiveCfg = Release | 39 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x64.ActiveCfg = Debug |
32 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x64.Build.0 = Release | 40 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x64.Build.0 = Debug |
33 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x86.ActiveCfg = Release | 41 | {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x86.ActiveCfg = Release |
34 | {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Debug|x64.ActiveCfg = Debug|x64 | 42 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x64.ActiveCfg = Debug|x64 |
35 | {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Debug|x64.Build.0 = Debug|x64 | 43 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x64.Build.0 = Debug|x64 |
36 | {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Debug|x86.ActiveCfg = Release|x64 | 44 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x86.ActiveCfg = Debug|Win32 |
37 | {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Debug|x86.Build.0 = Release|x64 | 45 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x86.Build.0 = Debug|Win32 |
38 | {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Release|x64.ActiveCfg = Release|x64 | 46 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x64.ActiveCfg = Debug|x64 |
39 | {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Release|x64.Build.0 = Release|x64 | 47 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x64.Build.0 = Debug|x64 |
40 | {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Release|x86.ActiveCfg = Release|Win32 | 48 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x86.ActiveCfg = Release|Win32 |
41 | {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Release|x86.Build.0 = Release|Win32 | 49 | {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x86.Build.0 = Release|Win32 |
50 | {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x64.ActiveCfg = Debug|x64 | ||
51 | {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x64.Build.0 = Debug|x64 | ||
52 | {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x86.ActiveCfg = Debug|Win32 | ||
53 | {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x86.Build.0 = Debug|Win32 | ||
54 | {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x64.ActiveCfg = Debug|x64 | ||
55 | {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x64.Build.0 = Debug|x64 | ||
56 | {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x86.ActiveCfg = Release|Win32 | ||
57 | {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x86.Build.0 = Release|Win32 | ||
42 | EndGlobalSection | 58 | EndGlobalSection |
43 | GlobalSection(SolutionProperties) = preSolution | 59 | GlobalSection(SolutionProperties) = preSolution |
44 | HideSolutionNode = FALSE | 60 | HideSolutionNode = FALSE |