Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Editor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ string(REGEX REPLACE "([.+?*])" "\\\\\\1" SDIR "${CMAKE_CURRENT_SOURCE_DIR}")

file(GLOB SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
list(FILTER SOURCE_FILES EXCLUDE REGEX ${SDIR}/main_.*)
list(FILTER SOURCE_FILES EXCLUDE REGEX ${SDIR}/stdafx.*)
list(APPEND SOURCE_FILES main_${PLATFORM}.cpp)


Expand Down Expand Up @@ -37,6 +38,8 @@ else ()

endif ()

target_precompile_headers(Editor PRIVATE "stdafx.h")

# Needed for terrain system
add_dependencies(Editor Content)

Expand Down
31 changes: 23 additions & 8 deletions Samples/Example_ImGui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ if (NOT WIN32)
find_package(Threads REQUIRED)
endif ()

set (SOURCE_FILES
stdafx.cpp
set(SOURCE_FILES
Example_ImGui.cpp
Example_ImGui.h
stdafx.h
)
set(IMGUI_FILES
ImGui/imconfig.h
ImGui/imgui.cpp
ImGui/imgui.h
Expand All @@ -22,32 +22,47 @@ set (SOURCE_FILES
)

if (WIN32)
list (APPEND SOURCE_FILES
list(APPEND SOURCE_FILES
main_Windows.cpp
main_Windows.h
Tests.rc
)
list(APPEND IMGUI_FILES
ImGui/imgui_impl_win32.cpp
ImGui/imgui_impl_win32.h
)
add_library(Example_ImGui_Lib OBJECT ${IMGUI_FILES})

add_executable(Example_ImGui WIN32 ${SOURCE_FILES})

target_link_libraries(Example_ImGui PUBLIC
target_link_libraries(Example_ImGui
PUBLIC
WickedEngine_Windows

PRIVATE
Example_ImGui_Lib
)
set(LIB_DXCOMPILER "dxcompiler.dll")
else()
list (APPEND SOURCE_FILES
list(APPEND SOURCE_FILES
main_SDL2.cpp
)
list(APPEND IMGUI_FILES
ImGui/imgui_impl_sdl.cpp
ImGui/imgui_impl_sdl.h
)

add_library(Example_ImGui_Lib OBJECT ${IMGUI_FILES})
find_package(SDL2 REQUIRED)
target_link_libraries(Example_ImGui_Lib PRIVATE SDL2::SDL2)
add_executable(Example_ImGui ${SOURCE_FILES})

target_link_libraries(Example_ImGui PUBLIC
target_link_libraries(Example_ImGui
PUBLIC
WickedEngine
Threads::Threads

PRIVATE
Example_ImGui_Lib
)

# Copy shaders to build and source folders just to be safe:
Expand Down
35 changes: 26 additions & 9 deletions Samples/Example_ImGui_Docking/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ if (NOT WIN32)
find_package(Threads REQUIRED)
endif ()

set (SOURCE_FILES
stdafx.cpp
set(SOURCE_FILES
Example_ImGui_Docking.cpp
Example_ImGui_Docking.h
stdafx.h
../../Editor/ModelImporter_GLTF.cpp
)
set(IMGUI_FILES
ImGui/imconfig.h
ImGui/imgui.cpp
ImGui/imgui.h
Expand All @@ -22,36 +23,50 @@ set (SOURCE_FILES
ImGui/ImGuizmo.cpp
ImGui/ImGuizmo.h
ImGui/IconsMaterialDesign.h
../../Editor/ModelImporter_GLTF.cpp
)

if (WIN32)
list (APPEND SOURCE_FILES
list(APPEND SOURCE_FILES
main_Windows.cpp
main_Windows.h
Tests.rc
)
list(APPEND IMGUI_FILES
ImGui/imgui_impl_win32.cpp
ImGui/imgui_impl_win32.h
)
add_library(Example_ImGui_Docking_Lib OBJECT ${IMGUI_FILES})

add_executable(Example_ImGui_Docking WIN32 ${SOURCE_FILES})

target_link_libraries(Example_ImGui_Docking PUBLIC
target_link_libraries(Example_ImGui_Docking
PUBLIC
WickedEngine_Windows

PRIVATE
Example_ImGui_Docking_Lib
)
set(LIB_DXCOMPILER "dxcompiler.dll")
else()
list (APPEND SOURCE_FILES
list(APPEND SOURCE_FILES
main_SDL2.cpp
)
list(APPEND IMGUI_FILES
ImGui/imgui_impl_sdl.cpp
ImGui/imgui_impl_sdl.h
)

add_library(Example_ImGui_Docking_Lib OBJECT ${IMGUI_FILES})
find_package(SDL2 REQUIRED)
target_link_libraries(Example_ImGui_Docking_Lib PRIVATE SDL2::SDL2)
add_executable(Example_ImGui_Docking ${SOURCE_FILES})

target_link_libraries(Example_ImGui_Docking PUBLIC
target_link_libraries(Example_ImGui_Docking
PUBLIC
WickedEngine
Threads::Threads

PRIVATE
Example_ImGui_Docking_Lib
)

# Copy shaders and font to build and source folders just to be safe:
Expand All @@ -66,6 +81,8 @@ else()
set(LIB_DXCOMPILER "libdxcompiler.so")
endif ()

target_precompile_headers(Example_ImGui_Docking PRIVATE stdafx.h)

if (MSVC)
set_property(TARGET Example_ImGui_Docking PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
endif ()
Expand Down
4 changes: 2 additions & 2 deletions Samples/Tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
cmake_minimum_required(VERSION 3.19)
set (SOURCE_FILES
stdafx.cpp
Tests.cpp
Tests.h
stdafx.h
)

if (WIN32)
Expand Down Expand Up @@ -34,6 +32,8 @@ else()
set(LIB_DXCOMPILER "libdxcompiler.so")
endif ()

target_precompile_headers(Tests PRIVATE stdafx.h)

if (MSVC)
set_property(TARGET Tests PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
endif ()
Expand Down
2 changes: 2 additions & 0 deletions WickedEngine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ add_library(${TARGET_NAME} ${WICKED_LIBRARY_TYPE}
${HEADER_FILES}
)

target_precompile_headers(${TARGET_NAME} PRIVATE WickedEngine.h)

add_library(WickedEngine ALIAS ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES
PUBLIC_HEADER "${HEADER_FILES}"
Expand Down