Only using the lodepng files in extern.
This commit is contained in:
parent
710644a822
commit
3a0ec498ae
@ -32,13 +32,21 @@ ADD_DEFINITIONS(-Wall)
|
||||
ENDIF(MSVC)
|
||||
ADD_DEFINITIONS(-DNO_SPACE_NAVIGATOR_SUPPORT)
|
||||
|
||||
#for lodepng
|
||||
SET(ACGL_BASE_DIR "${CMAKE_SOURCE_DIR}/extern/acgl")
|
||||
FILE(GLOB_RECURSE HEADER_FILES_EXTERN "${ACGL_BASE_DIR}/include/lodepng/*.h")
|
||||
FILE(GLOB_RECURSE SOURCE_FILES_EXTERN "${ACGL_BASE_DIR}/src/lodepng/*.cpp")
|
||||
INCLUDE_DIRECTORIES("${ACGL_BASE_DIR}/include")
|
||||
|
||||
#INCLUDE(${CMAKE_SOURCE_DIR}/extern/acgl/CMakeListsStaticInclude.txt)
|
||||
|
||||
#
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
FILE(GLOB_RECURSE SOURCE_FILES_CONV "${CMAKE_SOURCE_DIR}/converter/*.cc")
|
||||
SET(SOURCE_FILES_CONV ${SOURCE_FILES_CONV})
|
||||
SET(SOURCE_FILES_CONV ${SOURCE_FILES_CONV} ${SOURCE_FILES_EXTERN})
|
||||
|
||||
FILE(GLOB_RECURSE HEADER_FILES_CONV "${CMAKE_SOURCE_DIR}/converter/*.hh")
|
||||
SET(HEADER_FILES_CONV ${HEADER_FILES})
|
||||
SET(HEADER_FILES_CONV ${HEADER_FILES_CONV} ${HEADER_FILES_EXTERN})
|
||||
ADD_EXECUTABLE(converter ${SOURCE_FILES_CONV} ${HEADER_FILES_CONV})
|
||||
|
6096
converter/lodepng.cc
6096
converter/lodepng.cc
File diff suppressed because it is too large
Load Diff
1702
converter/lodepng.hh
1702
converter/lodepng.hh
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
#include "lodepng.hh"
|
||||
#include <lodepng/lodepng.h>
|
||||
#include <string>
|
||||
#include "converter.hh"
|
||||
#include <vector>
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include "graphics.hh"
|
||||
#include "lodepng.h"
|
||||
#include <lodepng/lodepng.h>
|
||||
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
|
6096
lodepng.cpp
6096
lodepng.cpp
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
#include "terrain.hh"
|
||||
#include "lodepng.h"
|
||||
#include <lodepng/lodepng.h>
|
||||
|
||||
Terrain::Terrain(std::string heightmapFilePath){
|
||||
this->heightmapFilePath = heightmapFilePath;
|
||||
|
Loading…
Reference in New Issue
Block a user