Skip to content

Commit

Permalink
Checkpoint.
Browse files Browse the repository at this point in the history
  • Loading branch information
edisonlee0212 committed Sep 3, 2024
1 parent 5c2561d commit c42faa1
Show file tree
Hide file tree
Showing 106 changed files with 92,343 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
[submodule "Extern/3rdParty/imgui/imgui"]
path = Extern/3rdParty/imgui/imgui
url = https://github.com/ocornut/imgui
[submodule "Extern/3rdParty/imgui/ImGuizmo"]
path = Extern/3rdParty/imgui/ImGuizmo
url = https://github.com/CedricGuillemet/ImGuizmo.git
[submodule "Extern/3rdParty/json/json"]
path = Extern/3rdParty/json/json
url = https://github.com/nlohmann/json
Expand Down
24 changes: 24 additions & 0 deletions EvoEngine_SDK/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,30 @@ target_compile_definitions(EvoEngine_SDK
)

if (WIN32)
if (CMAKE_BUILD_TYPE MATCHES "^[Rr]elease")
set(SHADERC_LIB ${SHADERC_DIR}lib/windows/shaderc_combined.lib)
set(ASSIMP_LIBS
#${ASSIMP_DIR}/lib/Release/assimp-vc143-mt.lib
#${ASSIMP_DIR}/lib/Release/zlibstatic.lib
)
elseif (CMAKE_BUILD_TYPE MATCHES "^[Rr]elWithDebInfo")
set(SHADERC_LIB ${SHADERC_DIR}lib/windows/shaderc_combined.lib)
set(ASSIMP_LIBS
#${ASSIMP_DIR}/lib/RelWithDebInfo/assimp-vc143-mt.lib
#${ASSIMP_DIR}/lib/RelWithDebInfo/zlibstatic.lib
)
else()
set(SHADERC_LIB ${SHADERC_DIR}lib/windows/shaderc_combined_d.lib)
set(ASSIMP_LIBS
#${ASSIMP_DIR}/lib/Debug/assimp-vc143-mtd.lib
#${ASSIMP_DIR}/lib/Debug/zlibstaticd.lib
)
endif ()
target_link_libraries(EvoEngine_SDK
#${GLFW_DIR}glfw3.lib
${SHADERC_LIB}
#${ASSIMP_LIBS}
)
# Compiler settings for Windows platform
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
target_compile_definitions(EvoEngine_SDK
Expand Down
4 changes: 3 additions & 1 deletion EvoEngine_SDK/include/EvoEngine_SDK_PCH.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
#include "GLFW/glfw3.h"

#define IMGUI_DEFINE_MATH_OPERATORS
#include <ImGuizmo.h>
#include <imgui.h>
#include <imgui_internal.h>

//#include <imgui_stdlib.hpp>
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
#define GLFW_EXPOSE_NATIVE_WIN32
Expand All @@ -60,6 +60,8 @@
#include <backends/imgui_impl_vulkan.h>
#endif

#include <ImGuizmo.h>

#include <assimp/Exporter.hpp>
#include <assimp/Importer.hpp>
#include <assimp/postprocess.h>
Expand Down
36 changes: 36 additions & 0 deletions Extern/3rdParty/base64/base64/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#################################################################################
# @project Common
# @brief Common libraries used throughout the project.
# @author Tomas Polasek
#################################################################################

cmake_minimum_required (VERSION 3.9)

set (PROJECT_NAME Base64)
project (${PROJECT_NAME})

set (PROJECT_HEADERS
include/base64.h
)

set (PROJECT_SOURCES
include/base64.cpp
)

add_library (
${PROJECT_NAME}
STATIC
${PROJECT_HEADERS}
${PROJECT_SOURCES}
)

target_include_directories (
${PROJECT_NAME}
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
)

add_library (
${COMMON_LIB}::${PROJECT_NAME}
ALIAS
${PROJECT_NAME}
)
Loading

0 comments on commit c42faa1

Please sign in to comment.