Skip to content

Commit 8c72b1b

Browse files
committed
Editor runs but crashes when clicking an element in the workspace
1 parent 88c1edf commit 8c72b1b

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

GUIEditor.vcxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<ClCompile>
6262
<Optimization>Disabled</Optimization>
6363
<AdditionalIncludeDirectories>$(ProjectDir)external\include;$(ProjectDir)Wrappers;$(SolutionDir)GUILibrary;$(ProjectDir)GUILibrary\Include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64-
<PreprocessorDefinitions>_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;GUI_STANDALONE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
64+
<PreprocessorDefinitions>_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;GUI_STANDALONE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6565
<MinimalRebuild>false</MinimalRebuild>
6666
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6767
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,6 +76,7 @@
7676
<IntrinsicFunctions>false</IntrinsicFunctions>
7777
<OmitFramePointers>false</OmitFramePointers>
7878
<ConformanceMode>true</ConformanceMode>
79+
<LanguageStandard>stdcpp17</LanguageStandard>
7980
</ClCompile>
8081
<Link>
8182
<AdditionalDependencies>dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;dsound.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;legacy_stdio_definitions.lib;allegro_static_debug.lib;RTEGUI.lib.debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -93,7 +94,7 @@
9394
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9495
<ClCompile>
9596
<AdditionalIncludeDirectories>$(ProjectDir)external\include;$(ProjectDir)Wrappers;$(SolutionDir)GUILibrary;$(ProjectDir)GUILibrary\Include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
96-
<PreprocessorDefinitions>_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;GUI_STANDALONE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
97+
<PreprocessorDefinitions>_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;GUI_STANDALONE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9798
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9899
<PrecompiledHeader>Use</PrecompiledHeader>
99100
<WarningLevel>Level2</WarningLevel>
@@ -106,6 +107,7 @@
106107
<IntrinsicFunctions>true</IntrinsicFunctions>
107108
<OmitFramePointers>true</OmitFramePointers>
108109
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
110+
<LanguageStandard>stdcpp17</LanguageStandard>
109111
</ClCompile>
110112
<Link>
111113
<AdditionalDependencies>dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;dsound.lib;winmm.lib;allegro_static_release.lib;RTEGUI.lib.release.lib;%(AdditionalDependencies)</AdditionalDependencies>

GUILibrary/GUILibrary.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<CompileAs>CompileAsCpp</CompileAs>
105105
<CallingConvention>Cdecl</CallingConvention>
106106
<OmitDefaultLibName>true</OmitDefaultLibName>
107-
<LanguageStandard>stdcpp14</LanguageStandard>
107+
<LanguageStandard>stdcpp17</LanguageStandard>
108108
<FloatingPointModel>Fast</FloatingPointModel>
109109
</ClCompile>
110110
<Link>
@@ -146,7 +146,7 @@
146146
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
147147
<OmitFramePointers>true</OmitFramePointers>
148148
<OmitDefaultLibName>true</OmitDefaultLibName>
149-
<LanguageStandard>stdcpp14</LanguageStandard>
149+
<LanguageStandard>stdcpp17</LanguageStandard>
150150
<FloatingPointModel>Fast</FloatingPointModel>
151151
</ClCompile>
152152
<Link>

GUILibrary/LibraryIncludes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <cerrno>
3535
#include <cassert>
3636
#include <limits>
37-
#include <experimental/filesystem>
37+
#include <filesystem>
3838

3939
using std::string;
4040
using std::list;

Main.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
using namespace RTE;
55

66
extern "C" { FILE __iob_func[3] = { *stdin, *stdout, *stderr }; }
7-
extern HINSTANCE g_hInstance = 0;
8-
extern HWND g_hWnd = 0;
7+
//extern HINSTANCE g_hInstance = 0;
8+
//extern HWND g_hWnd = 0;
99

1010
/// <summary>
1111
/// Entry point for the GUI Library editor.
1212
/// </summary>
1313
int main(int argc, char *argv[]) {
14-
if (!g_GUIEditor.Initialize()) { return -1; }
14+
//if (!g_GUIEditor.Initialize()) { return -1; }
1515

1616
// Get windows settings
17-
g_hWnd = win_get_window();
18-
g_hInstance = (HINSTANCE)GetWindowLong(g_hWnd, GWL_HINSTANCE);
17+
//g_hWnd = win_get_window();
18+
//g_hInstance = (HINSTANCE)GetWindowLong(g_hWnd, GWL_HINSTANCE);
1919

2020
// Run editor loop
2121
while (true) {
@@ -24,4 +24,5 @@ int main(int argc, char *argv[]) {
2424
}
2525
return 0;
2626
}
27-
END_OF_MAIN()
27+
28+
int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { return main(__argc, __argv); }

0 commit comments

Comments
 (0)