diff --git a/CMakeLists.txt b/CMakeLists.txt index 846cf58..f964e08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ FILE(GLOB_RECURSE README_FILES "${CMAKE_SOURCE_DIR}/../README.TXT") # all we need for ACGL: # ADD_DEFINITIONS(-DACGL_ERROR_LEVEL_EC3) -INCLUDE(${CMAKE_SOURCE_DIR}/../extern/acgl/CMakeListsStaticInclude.txt) +INCLUDE(${CMAKE_SOURCE_DIR}/extern/acgl/CMakeListsStaticInclude.txt) # # ############################################################################### @@ -87,11 +87,11 @@ INCLUDE(${CMAKE_SOURCE_DIR}/../extern/acgl/CMakeListsStaticInclude.txt) # GLFW (and some other linker flags) # -FILE(GLOB_RECURSE HEADER_FILES_GLFW "${CMAKE_SOURCE_DIR}/../extern/glfw/include/*.h") -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../extern/glfw/include) +FILE(GLOB_RECURSE HEADER_FILES_GLFW "${CMAKE_SOURCE_DIR}/extern/glfw/include/*.h") +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/glfw/include) SET(HEADER_FILES ${HEADER_FILES} ${HEADER_FILES_GLFW}) -add_subdirectory(../extern/glfw ${CMAKE_SOURCE_DIR}/../extern/glfw) +add_subdirectory(extern/glfw ${CMAKE_SOURCE_DIR}/../extern/glfw) SET(LIBRARIES glfw ${GLFW_LIBRARIES}) diff --git a/basic-texturing.cc b/basic-texturing.cc index f207bd3..5d94802 100644 --- a/basic-texturing.cc +++ b/basic-texturing.cc @@ -1,4 +1,4 @@ -#include "../shared/main.hh" +#include "main.hh" #include #include @@ -23,9 +23,9 @@ void initCustomResources() { // define where shaders and textures can be found: Settings::the()->setResourcePath("../"); - Settings::the()->setShaderPath("003-basic-texturing/Shader/"); - Settings::the()->setTexturePath("shared/Geometry/"); - Settings::the()->setGeometryPath("shared/Geometry/"); + Settings::the()->setShaderPath("Shader/"); + Settings::the()->setTexturePath("Geometry/"); + Settings::the()->setGeometryPath("Geometry/"); // load the geometry of the stanford bunny and build a VAO: vaoBunny = VertexArrayObjectCreator("Bunny.obj").create();