Only using the lodepng files in extern.

This commit is contained in:
Faerbit 2015-03-12 11:41:19 +01:00
parent 710644a822
commit 3a0ec498ae
8 changed files with 13 additions and 15601 deletions

View File

@ -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})

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
#include "lodepng.hh"
#include <lodepng/lodepng.h>
#include <string>
#include "converter.hh"
#include <vector>

View File

@ -1,5 +1,5 @@
#include "graphics.hh"
#include "lodepng.h"
#include <lodepng/lodepng.h>
#include <iomanip>
#include <sstream>

File diff suppressed because it is too large Load Diff

1702
lodepng.h

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
#include "terrain.hh"
#include "lodepng.h"
#include <lodepng/lodepng.h>
Terrain::Terrain(std::string heightmapFilePath){
this->heightmapFilePath = heightmapFilePath;