Skip to content

Commit 99bdf72

Browse files
windows not compile fixes
1 parent c2f0a2c commit 99bdf72

10 files changed

Lines changed: 21 additions & 19 deletions

File tree

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
path = __externals/stb
66
url = https://github.com/nothings/stb
77
[submodule "__externals/imgui/src"]
8-
path = __externals/imgui/src
8+
path = __externals/imgui/imgui
99
url = https://github.com/ocornut/imgui
1010
[submodule "__externals/spdlog"]
1111
path = __externals/spdlog
@@ -59,11 +59,11 @@
5959
path = __externals/Vulkan-Headers
6060
url = https://github.com/KhronosGroup/Vulkan-Headers
6161
[submodule "__externals/tlsf/src"]
62-
path = __externals/tlsf/src
62+
path = __externals/tlsf/tlsf
6363
url = https://github.com/mattconte/tlsf
6464
[submodule "__externals/CLI11"]
6565
path = __externals/CLI11
6666
url = https://github.com/CLIUtils/CLI11
6767
[submodule "__externals/rapidhash/src"]
68-
path = __externals/rapidhash/src
68+
path = __externals/rapidhash/rapidhash
6969
url = https://github.com/Nicoshev/rapidhash

ZEngine/ZEngine/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ target_link_libraries (zEngineLib PUBLIC imported::External_libs)
3030

3131
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
3232
target_link_libraries (zEngineLib PUBLIC imported::cppwinrt_headers WindowsApp.lib)
33+
target_compile_definitions(zEngineLib PUBLIC NOMINMAX)
3334
endif()

ZEngine/ZEngine/Core/Containers/HashMap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <ZEngine/Core/Containers/Array.h>
33
#include <ZEngine/Core/Memory/Allocator.h>
44
#include <ZEngine/Helpers/MemoryOperations.h>
5-
#include <rapidhash.h>
5+
#include <rapidhash/rapidhash.h>
66

77
namespace ZEngine::Core::Containers
88
{

ZEngine/ZEngine/Engine.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <ZEngine/Engine.h>
2+
#include <ZEngine/Event/EngineClosedEvent.h>
23
#include <ZEngine/Logging/LoggerDefinition.h>
34
#include <ZEngine/Rendering/Renderers/GraphicRenderer.h>
45
#include <ZEngine/Windows/CoreWindow.h>

__externals/imgui/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
set(CMAKE_CXX_STANDARD 11)
22

33
list (APPEND IMGUI_SOURCE
4-
src/imgui.h
5-
src/imgui_internal.h
6-
src/imgui.cpp
7-
src/imgui_tables.cpp
8-
src/imgui_widgets.cpp
9-
src/imgui_demo.cpp
10-
src/imgui_draw.cpp
11-
src/backends/imgui_impl_vulkan.cpp
12-
src/backends/imgui_impl_glfw.cpp
4+
imgui/imgui.h
5+
imgui/imgui_internal.h
6+
imgui/imgui.cpp
7+
imgui/imgui_tables.cpp
8+
imgui/imgui_widgets.cpp
9+
imgui/imgui_demo.cpp
10+
imgui/imgui_draw.cpp
11+
imgui/backends/imgui_impl_vulkan.cpp
12+
imgui/backends/imgui_impl_glfw.cpp
1313
)
1414

1515
# Source files
@@ -20,8 +20,8 @@ add_library (imgui STATIC ${IMGUI_SOURCE})
2020
#
2121
target_include_directories (imgui
2222
PUBLIC
23-
./src
24-
./src/backends
23+
.
24+
./imgui
2525
)
2626

2727
target_link_libraries(imgui PUBLIC

__externals/rapidhash/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
77
add_library(rapidhash INTERFACE)
88

99
target_include_directories(rapidhash INTERFACE
10-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
10+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
1111
)

__externals/tlsf/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
set(CMAKE_CXX_STANDARD 11)
22

33
list (APPEND TLSF_SOURCE
4-
src/tlsf.h
5-
src/tlsf.c
4+
tlsf/tlsf.h
5+
tlsf/tlsf.c
66
)
77

88
# Source files
@@ -13,6 +13,6 @@ add_library (tlsf STATIC ${TLSF_SOURCE})
1313
#
1414
target_include_directories (tlsf
1515
PUBLIC
16-
./src
16+
.
1717
)
1818

0 commit comments

Comments
 (0)