Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add basic Linux+CMake support! #31

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.vs/
bin/
bin-int/
*build*/

# Files
*.vcxproj
Expand Down
14 changes: 14 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
cmake_minimum_required (VERSION 3.13)

project(Walnut)

find_package(Vulkan REQUIRED)

# TODO: Figure out how to allow later standards
if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
endif()

add_subdirectory(vendor)
add_subdirectory(Walnut)
add_subdirectory(WalnutApp)
25 changes: 25 additions & 0 deletions Walnut/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
file(GLOB_RECURSE Walnut_SRC LIST_DIRECTORIES false src/*.cpp)

add_library(Walnut STATIC ${Walnut_SRC})
target_include_directories(Walnut PUBLIC src)
# set_property(TARGET Walnut PROPERTY POSITION_INDEPENDENT_CODE ON)

# setup internal project compile definition
if(WIN32)
target_compile_definitions(Walnut PRIVATE WL_PLATFORM_WINDOWS)
endif()

if(CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(Walnut PRIVATE WL_DEBUG)
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
target_compile_definitions(Walnut PRIVATE WL_RELEASE)
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
target_compile_definitions(Walnut PRIVATE WL_DIST)
endif()

target_link_libraries(Walnut PUBLIC imgui glfw glm::glm stb_image Vulkan::Vulkan)
if(WIN32)
target_link_libraries(Walnut PUBLIC dwmapi)
endif()

install(TARGETS Walnut DESTINATION bin)
8 changes: 2 additions & 6 deletions Walnut/src/Walnut/EntryPoint.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once

#ifdef WL_PLATFORM_WINDOWS

extern Walnut::Application* Walnut::CreateApplication(int argc, char** argv);
bool g_ApplicationRunning = true;

Expand All @@ -21,7 +19,7 @@ namespace Walnut {

}

#ifdef WL_DIST
#if defined(WL_DIST) && defined(WL_PLATFORM_WINDOWS)

#include <Windows.h>

Expand All @@ -37,6 +35,4 @@ int main(int argc, char** argv)
return Walnut::Main(argc, argv);
}

#endif // WL_DIST

#endif // WL_PLATFORM_WINDOWS
#endif // WL_DIST && WL_PLATFORM_WINDOWS
20 changes: 20 additions & 0 deletions WalnutApp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
file(GLOB_RECURSE WalnutApp_SRC LIST_DIRECTORIES false src/*.cpp)

add_executable(WalnutApp ${WalnutApp_SRC})
target_include_directories(WalnutApp PRIVATE src)
target_link_libraries(WalnutApp PRIVATE Walnut)

# setup internal project compile definition
if(WIN32)
target_compile_definitions(Walnut PRIVATE WL_PLATFORM_WINDOWS)
endif()

if(CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(WalnutApp PRIVATE WL_DEBUG)
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
target_compile_definitions(WalnutApp PRIVATE WL_RELEASE)
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
target_compile_definitions(WalnutApp PRIVATE WL_DIST)
endif()

install(TARGETS WalnutApp DESTINATION bin)
16 changes: 16 additions & 0 deletions vendor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Setup vendor libraries
## IMGUI (No CMake support, we have to roll or own)
set(imgui_SRC imgui/imgui.cpp imgui/imgui_draw.cpp imgui/imgui_tables.cpp imgui/imgui_widgets.cpp imgui/imgui_demo.cpp)
add_library(imgui STATIC ${imgui_SRC})
target_include_directories(imgui PUBLIC imgui)
set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON)

## GLFW (comes with its own CMakeLists, let's use that)
add_subdirectory(GLFW)

## glm (comes with its own CMakeLists, let's use that)
add_subdirectory(glm)

## stb_image (header-only, create a dummy interface library)
add_library(stb_image INTERFACE)
target_include_directories(stb_image INTERFACE stb_image)