diff options
Diffstat (limited to 'Source')
-rw-r--r-- | Source/Main.cpp | 193 | ||||
-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.ico | bin | 46227 -> 0 bytes | |||
-rw-r--r-- | Source/Source.vcxproj | 111 | ||||
-rw-r--r-- | Source/Source.vcxproj.filters | 38 | ||||
-rw-r--r-- | Source/Version.h | 14 | ||||
-rw-r--r-- | Source/Version.rc | 6 | ||||
-rw-r--r-- | Source/small.ico | bin | 46227 -> 0 bytes |
10 files changed, 59 insertions, 306 deletions
diff --git a/Source/Main.cpp b/Source/Main.cpp deleted file mode 100644 index ce0e550..0000000 --- a/Source/Main.cpp +++ /dev/null | |||
@@ -1,193 +0,0 @@ | |||
1 | #include "windows.h" | ||
2 | #include <Richedit.h> | ||
3 | |||
4 | #include <string> | ||
5 | |||
6 | #include "Randomizer.h" | ||
7 | #include "Version.h" | ||
8 | #include "Random.h" | ||
9 | #include "Panel.h" | ||
10 | |||
11 | #define IDC_RANDOMIZE 0x401 | ||
12 | #define IDC_TOGGLESPEED 0x402 | ||
13 | #define IDC_SPEEDRUNNER 0x403 | ||
14 | #define IDC_HARDMODE 0x404 | ||
15 | #define IDC_READ 0x405 | ||
16 | #define IDC_RANDOM 0x406 | ||
17 | #define IDC_WRITE 0x407 | ||
18 | #define IDC_DUMP 0x408 | ||
19 | |||
20 | HWND hwndSeed, hwndRandomize; | ||
21 | // int panel = 0x18AF; | ||
22 | int panel = 0x33D4; | ||
23 | std::shared_ptr<Panel> _panel; | ||
24 | |||
25 | LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) | ||
26 | { | ||
27 | static bool wasSeedRandomlyGenerated; | ||
28 | |||
29 | if (message == WM_DESTROY) { | ||
30 | PostQuitMessage(0); | ||
31 | } else if (message == WM_COMMAND) { | ||
32 | switch (LOWORD(wParam)) { | ||
33 | // Speed checkbox | ||
34 | case IDC_TOGGLESPEED: | ||
35 | if (IsDlgButtonChecked(hwnd, IDC_TOGGLESPEED)) { | ||
36 | CheckDlgButton(hwnd, IDC_TOGGLESPEED, BST_UNCHECKED); | ||
37 | } else { | ||
38 | CheckDlgButton(hwnd, IDC_TOGGLESPEED, BST_CHECKED); | ||
39 | } | ||
40 | break; | ||
41 | |||
42 | // Randomize button | ||
43 | case IDC_RANDOMIZE: | ||
44 | { | ||
45 | std::wstring text(100, '\0'); | ||
46 | GetWindowText(hwndSeed, &text[0], 100); | ||
47 | int seed = 0; | ||
48 | if (wasSeedRandomlyGenerated || wcslen(text.c_str()) == 0) { | ||
49 | seed = Random::RandInt(0, 100000); | ||
50 | wasSeedRandomlyGenerated = true; | ||
51 | } else { | ||
52 | seed = _wtoi(text.c_str()); | ||
53 | wasSeedRandomlyGenerated = false; | ||
54 | } | ||
55 | |||
56 | Randomizer randomizer; | ||
57 | short metadata = randomizer.Randomize(seed); | ||
58 | if (metadata & 0x1) break; // Was already randomized | ||
59 | |||
60 | std::wstring seedString = std::to_wstring(seed); | ||
61 | SetWindowText(hwndSeed, seedString.c_str()); | ||
62 | if (IsDlgButtonChecked(hwnd, IDC_TOGGLESPEED)) { | ||
63 | randomizer.AdjustSpeed(); | ||
64 | } | ||
65 | SetWindowText(hwndRandomize, L"Randomized!"); | ||
66 | break; | ||
67 | } | ||
68 | case IDC_READ: | ||
69 | _panel = std::make_shared<Panel>(panel); | ||
70 | break; | ||
71 | case IDC_RANDOM: | ||
72 | _panel->Random(); | ||
73 | break; | ||
74 | case IDC_WRITE: | ||
75 | _panel->Write(panel); | ||
76 | break; | ||
77 | case IDC_DUMP: | ||
78 | _panel->Serialize(); | ||
79 | break; | ||
80 | } | ||
81 | } | ||
82 | return DefWindowProc(hwnd, message, wParam, lParam); | ||
83 | } | ||
84 | |||
85 | int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) | ||
86 | { | ||
87 | LoadLibrary(L"Msftedit.dll"); | ||
88 | |||
89 | WNDCLASSW wndClass = { | ||
90 | CS_HREDRAW | CS_VREDRAW, | ||
91 | WndProc, | ||
92 | 0, | ||
93 | 0, | ||
94 | hInstance, | ||
95 | NULL, | ||
96 | LoadCursor(nullptr, IDC_ARROW), | ||
97 | (HBRUSH)(COLOR_WINDOW+1), | ||
98 | WINDOW_CLASS, | ||
99 | WINDOW_CLASS, | ||
100 | }; | ||
101 | RegisterClassW(&wndClass); | ||
102 | |||
103 | RECT rect; | ||
104 | GetClientRect(GetDesktopWindow(), &rect); | ||
105 | HWND hwnd = CreateWindow(WINDOW_CLASS, PRODUCT_NAME, WS_OVERLAPPEDWINDOW, | ||
106 | rect.right - 550, 200, 500, 500, nullptr, nullptr, hInstance, nullptr); | ||
107 | |||
108 | CreateWindow(L"STATIC", L"Version: " VERSION_STR, | ||
109 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, | ||
110 | 390, 15, 90, 16, hwnd, NULL, hInstance, NULL); | ||
111 | |||
112 | CreateWindow(L"STATIC", L"Enter a seed:", | ||
113 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, | ||
114 | 10, 15, 90, 16, hwnd, NULL, hInstance, NULL); | ||
115 | hwndSeed = CreateWindow(MSFTEDIT_CLASS, L"", | ||
116 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | WS_BORDER, | ||
117 | 100, 10, 50, 26, hwnd, NULL, hInstance, NULL); | ||
118 | hwndRandomize = CreateWindow(L"BUTTON", L"Randomize", | ||
119 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, | ||
120 | 160, 10, 100, 26, hwnd, (HMENU)IDC_RANDOMIZE, hInstance, NULL); | ||
121 | |||
122 | #if GLOBALS == 0x5B28C0 | ||
123 | CreateWindow(L"BUTTON", L"READ", | ||
124 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, | ||
125 | 160, 100, 100, 26, hwnd, (HMENU)IDC_READ, hInstance, NULL); | ||
126 | CreateWindow(L"BUTTON", L"RANDOM", | ||
127 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, | ||
128 | 160, 130, 100, 26, hwnd, (HMENU)IDC_RANDOM, hInstance, NULL); | ||
129 | CreateWindow(L"BUTTON", L"WRITE", | ||
130 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, | ||
131 | 160, 160, 100, 26, hwnd, (HMENU)IDC_WRITE, hInstance, NULL); | ||
132 | CreateWindow(L"BUTTON", L"DUMP", | ||
133 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, | ||
134 | 160, 190, 100, 26, hwnd, (HMENU)IDC_DUMP, hInstance, NULL); | ||
135 | #endif | ||
136 | |||
137 | CreateWindow(L"BUTTON", L"", | ||
138 | WS_VISIBLE | WS_CHILD | BS_CHECKBOX, | ||
139 | 10, 52, 12, 12, hwnd, (HMENU)IDC_TOGGLESPEED, hInstance, NULL); | ||
140 | CreateWindow(L"STATIC", L"Speed up various autoscrollers", | ||
141 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, | ||
142 | 27, 50, 205, 16, hwnd, NULL, hInstance, NULL); | ||
143 | |||
144 | /* | ||
145 | CreateWindow(L"BUTTON", L"", | ||
146 | WS_VISIBLE | WS_CHILD | BS_CHECKBOX, | ||
147 | 10, 52, 12, 12, hwnd, (HMENU)IDC_SPEEDRUNNER, hInstance, NULL); | ||
148 | CreateWindow(L"STATIC", L"Allow hard-to-identify panels to be shuffled", | ||
149 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, | ||
150 | 27, 50, 205, 16, hwnd, NULL, hInstance, NULL); | ||
151 | |||
152 | CreateWindow(L"BUTTON", L"", | ||
153 | WS_VISIBLE | WS_CHILD | BS_CHECKBOX, | ||
154 | 10, 52, 12, 12, hwnd, (HMENU)IDC_HARDMODE, hInstance, NULL); | ||
155 | CreateWindow(L"STATIC", L"Place harder puzzles in annoying spots", | ||
156 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, | ||
157 | 27, 50, 205, 16, hwnd, NULL, hInstance, NULL); | ||
158 | |||
159 | CreateWindow(L"BUTTON", L"", | ||
160 | WS_VISIBLE | WS_CHILD | BS_CHECKBOX, | ||
161 | 10, 52, 12, 12, hwnd, (HMENU)IDC_NORANDOMIZE, hInstance, NULL); | ||
162 | CreateWindow(L"STATIC", L"Do not randomize any puzzles", | ||
163 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, | ||
164 | 27, 50, 205, 16, hwnd, NULL, hInstance, NULL); | ||
165 | |||
166 | CreateWindow(L"BUTTON", L"", | ||
167 | WS_VISIBLE | WS_CHILD | BS_CHECKBOX, | ||
168 | 10, 52, 12, 12, hwnd, (HMENU)IDC_CASUAL, hInstance, NULL); | ||
169 | CreateWindow(L"STATIC", L"Don't randomize context-based puzzles", | ||
170 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, | ||
171 | 27, 50, 205, 16, hwnd, NULL, hInstance, NULL); | ||
172 | |||
173 | CreateWindow(L"BUTTON", L"", | ||
174 | WS_VISIBLE | WS_CHILD | BS_CHECKBOX, | ||
175 | 10, 52, 12, 12, hwnd, (HMENU)IDC_BANSNIPES, hInstance, NULL); | ||
176 | CreateWindow(L"STATIC", L"Prevent sniping certain puzzles", | ||
177 | WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, | ||
178 | 27, 50, 205, 16, hwnd, NULL, hInstance, NULL); | ||
179 | |||
180 | */ | ||
181 | |||
182 | ShowWindow(hwnd, nCmdShow); | ||
183 | UpdateWindow(hwnd); | ||
184 | |||
185 | MSG msg; | ||
186 | while (!GetMessage(&msg, nullptr, 0, 0) == 0) | ||
187 | { | ||
188 | TranslateMessage(&msg); | ||
189 | DispatchMessage(&msg); | ||
190 | } | ||
191 | |||
192 | return (int) msg.wParam; | ||
193 | } | ||
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.ico b/Source/Source.ico deleted file mode 100644 index b3ec03b..0000000 --- a/Source/Source.ico +++ /dev/null | |||
Binary files differ | |||
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/Source/Version.h b/Source/Version.h deleted file mode 100644 index 05696d6..0000000 --- a/Source/Version.h +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | #pragma once | ||
2 | |||
3 | #define TO_STRING2(s) L#s | ||
4 | #define TO_STRING(s) TO_STRING2(s) | ||
5 | |||
6 | #define MAJOR 4 | ||
7 | #define MINOR 0 | ||
8 | #define PATCH 0 | ||
9 | |||
10 | #define VERSION_STR TO_STRING(MAJOR) L"." TO_STRING(MINOR) L"." TO_STRING(PATCH) | ||
11 | #define VERSION MAJOR, MINOR, PATCH | ||
12 | |||
13 | #define PRODUCT_NAME L"Witness Randomizer" | ||
14 | #define WINDOW_CLASS L"WitnessRandomizer" | ||
diff --git a/Source/Version.rc b/Source/Version.rc deleted file mode 100644 index 9b90884..0000000 --- a/Source/Version.rc +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #include "version.h" | ||
2 | |||
3 | VS_VERSION_INFO VERSIONINFO | ||
4 | FILEVERSION VERSION | ||
5 | BEGIN | ||
6 | END | ||
diff --git a/Source/small.ico b/Source/small.ico deleted file mode 100644 index b3ec03b..0000000 --- a/Source/small.ico +++ /dev/null | |||
Binary files differ | |||