Fix bug from source consolidation refactor

This commit is contained in:
Jack Andersen 2016-05-09 17:05:14 -10:00
parent 44d8f1ddc3
commit 2b6f0ca269
3 changed files with 2 additions and 4 deletions

View File

@ -1,4 +1,4 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${BOO_INCLUDE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${BOO_INCLUDE_DIR} ${LIBJPEG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/DataSpec) ${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/DataSpec)
macro(runtime_add_list rel_path a_list) macro(runtime_add_list rel_path a_list)

View File

@ -4,8 +4,6 @@ elseif(APPLE)
set(PLAT_SRCS CLineRendererShadersMetal.cpp CModelShadersMetal.cpp) set(PLAT_SRCS CLineRendererShadersMetal.cpp CModelShadersMetal.cpp)
endif() endif()
include_directories(${LIBJPEG_INCLUDE_DIR})
set(GRAPHICS_SOURCES set(GRAPHICS_SOURCES
IRenderer.hpp IRenderer.hpp
CBooRenderer.hpp CBooRenderer.cpp CBooRenderer.hpp CBooRenderer.cpp

2
amuse

@ -1 +1 @@
Subproject commit 11739d86e28bb556852f61c04fbe8cc04242d0b8 Subproject commit a62fa64fb553d4fc1a4053bf78b495c281bfe4ad