From 503399a650f66b999bd4f85b715e3edbb3a36b43 Mon Sep 17 00:00:00 2001 From: Jordan Halase Date: Thu, 31 Oct 2019 08:33:38 -0500 Subject: Build from project root --- CMakeLists.txt | 4 ++-- compiling.txt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e63816d..e22a915 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,10 +3,10 @@ project(vkpugltest LANGUAGES C) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") -set(pugldir "../../pugl") +set(pugldir "../pugl") set(PUGL_INCLUDE "${pugldir}") set(PUGL_LIBDIR "${pugldir}/build") -set(PUGL_LIBS "-L${PUGL_LIBDIR} -Wl,-rpath,${PUGL_LIBDIR}") +set(PUGL_LIBS "-L../${PUGL_LIBDIR} -Wl,-rpath,${PUGL_LIBDIR}") include_directories(../pugl) add_executable(vkpugltest main.c) diff --git a/compiling.txt b/compiling.txt index b270272..90e6988 100644 --- a/compiling.txt +++ b/compiling.txt @@ -6,8 +6,8 @@ version is compiled using CMake. Currently, on Windows, the file `pugl_win.dll` may need to be moved into the executable directory. -To compile on Linux, simply create a build directory, call CMake, then make. +To compile on Linux, simply run the following commands from the project root: -1) mkdir build && cd build -2) cmake .. -3) make +1) cmake -S . -B build +2) make -C build +3) ./build/vkpugltest -- cgit v1.2.1