faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Changed paths to make it compile again.

Browse Source
This commit is contained in:
Faerbit 2014-10-20 17:51:15 +02:00
parent f69d2baee1
commit 23ec6e20f8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -77,7 +77,7 @@ FILE(GLOB_RECURSE README_FILES "${CMAKE_SOURCE_DIR}/../README.TXT")
# all we need for ACGL: # all we need for ACGL:
# #
ADD_DEFINITIONS(-DACGL_ERROR_LEVEL_EC3) 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) # GLFW (and some other linker flags)
# #
FILE(GLOB_RECURSE HEADER_FILES_GLFW "${CMAKE_SOURCE_DIR}/../extern/glfw/include/*.h") FILE(GLOB_RECURSE HEADER_FILES_GLFW "${CMAKE_SOURCE_DIR}/extern/glfw/include/*.h")
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../extern/glfw/include) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/glfw/include)
SET(HEADER_FILES ${HEADER_FILES} ${HEADER_FILES_GLFW}) 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}) SET(LIBRARIES glfw ${GLFW_LIBRARIES})

8
basic-texturing.cc
View File

@ -1,4 +1,4 @@
#include "../shared/main.hh" #include "main.hh"
#include <ACGL/OpenGL/Creator/ShaderProgramCreator.hh> #include <ACGL/OpenGL/Creator/ShaderProgramCreator.hh>
#include <ACGL/OpenGL/Creator/VertexArrayObjectCreator.hh> #include <ACGL/OpenGL/Creator/VertexArrayObjectCreator.hh>
@ -23,9 +23,9 @@ void initCustomResources()
{ {
// define where shaders and textures can be found: // define where shaders and textures can be found:
Settings::the()->setResourcePath("../"); Settings::the()->setResourcePath("../");
Settings::the()->setShaderPath("003-basic-texturing/Shader/"); Settings::the()->setShaderPath("Shader/");
Settings::the()->setTexturePath("shared/Geometry/"); Settings::the()->setTexturePath("Geometry/");
Settings::the()->setGeometryPath("shared/Geometry/"); Settings::the()->setGeometryPath("Geometry/");
// load the geometry of the stanford bunny and build a VAO: // load the geometry of the stanford bunny and build a VAO:
vaoBunny = VertexArrayObjectCreator("Bunny.obj").create(); vaoBunny = VertexArrayObjectCreator("Bunny.obj").create();