From cc86a7139221e10c15567bc4cafcf1bc2d55bd5f Mon Sep 17 00:00:00 2001 From: allem Date: Tue, 1 Oct 2019 20:24:04 -0400 Subject: [PATCH] builds on debian --- CMakeLists.txt | 1 + cosets/CMakeLists.txt | 10 +++------- cosets/src/main.cpp | 4 ---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 649275b..cfbbb7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.13) +project(vis-cosets) set(CMAKE_CXX_STANDARD 17) diff --git a/cosets/CMakeLists.txt b/cosets/CMakeLists.txt index b95988f..1be02b7 100644 --- a/cosets/CMakeLists.txt +++ b/cosets/CMakeLists.txt @@ -1,5 +1,3 @@ -project(cosets) - add_custom_target(shaders ALL DEPENDS shader_output) add_custom_command( OUTPUT shader_output @@ -7,18 +5,16 @@ add_custom_command( COMMENT "copying shaders" ) -add_executable(${PROJECT_NAME} +add_executable(cosets src/main.cpp src/util/files.cpp src/util/numeric.cpp src/util/shader.cpp src/util/window.cpp) -target_include_directories(${PROJECT_NAME} PRIVATE include) +target_include_directories(cosets PRIVATE include) add_dependencies(cosets shaders) -target_link_libraries(${PROJECT_NAME} +target_link_libraries(cosets PRIVATE glad glm glfw) - -add_executable(combos src/combos.cpp) diff --git a/cosets/src/main.cpp b/cosets/src/main.cpp index 33b42fc..769a364 100644 --- a/cosets/src/main.cpp +++ b/cosets/src/main.cpp @@ -9,10 +9,6 @@ #include #include -extern "C" { -__declspec(dllexport) int NvOptimusEnablement = 0x00000001; -} - using namespace std; class CosetsWindow : public Window {