Some tweaks to get the linux build running -fixed

master
MitchellHansen 8 years ago
parent 791aa96da7
commit 0974ab9e83

@ -7,8 +7,11 @@ set(PNAME Game)
project(${PNAME}) project(${PNAME})
# Set up variables, and find SFML # Set up variables, and find SFML
set(SFML_ROOT root CACHE STRING "User specified path") if (WIN32)
set(SFML_INCLUDE_DIR ${SFML_ROOT}/include) set(SFML_ROOT root CACHE STRING "User specified path")
set(SFML_INCLUDE_DIR ${SFML_ROOT}/include)
endif()
set(SFML_COMPONENTS graphics window system network audio) set(SFML_COMPONENTS graphics window system network audio)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
find_package(SFML 2.1 COMPONENTS ${SFML_COMPONENTS} REQUIRED) find_package(SFML 2.1 COMPONENTS ${SFML_COMPONENTS} REQUIRED)
@ -58,6 +61,7 @@ target_link_libraries (${PNAME} ${SFML_LIBRARIES} ${SFML_DEPENDENCIES})
target_link_libraries (${PNAME} ${OpenCL_LIBRARY}) target_link_libraries (${PNAME} ${OpenCL_LIBRARY})
target_link_libraries (${PNAME} ${OPENGL_LIBRARIES}) target_link_libraries (${PNAME} ${OPENGL_LIBRARIES})
target_link_libraries (${PNAME} ${GLEW_LIBRARIES}) target_link_libraries (${PNAME} ${GLEW_LIBRARIES})
target_link_libraries (${PNAME} -lpthread)
#target_link_libraries (${PNAME} ${Vulkan_LIBRARIES}) #target_link_libraries (${PNAME} ${Vulkan_LIBRARIES})
# Setup to use C++11 # Setup to use C++11

@ -1,6 +1,8 @@
#pragma once #pragma once
#include <string> #include <string>
#include <util.hpp> #include <util.hpp>
#include <cstring>
#define GLEW_STATIC #define GLEW_STATIC
#include <GL/glew.h> #include <GL/glew.h>

@ -12,6 +12,7 @@
#include <deque> #include <deque>
#include <unordered_map> #include <unordered_map>
#include <bitset> #include <bitset>
#include <cstring>
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <math.h> #include <math.h>

@ -2,7 +2,7 @@
#include <SFML/System/Vector3.hpp> #include <SFML/System/Vector3.hpp>
#include <SFML/System/Vector2.hpp> #include <SFML/System/Vector2.hpp>
#include <Map.h> #include <Map.h>
#include "Old_map.h" #include "Old_Map.h"
#include "Camera.h" #include "Camera.h"

@ -4,7 +4,7 @@
#include "SFML/Graphics.hpp" #include "SFML/Graphics.hpp"
#include "CL_Wrapper.h" #include "CL_Wrapper.h"
#include "Camera.h" #include "Camera.h"
#include "Old_map.h" #include "Old_Map.h"
#include "RayCaster.h" #include "RayCaster.h"
// Renderer needs to handle the distinction between a few difference circumstances. // Renderer needs to handle the distinction between a few difference circumstances.

@ -3,7 +3,7 @@
#include <SFML/System/Vector3.hpp> #include <SFML/System/Vector3.hpp>
#include <SFML/System/Vector2.hpp> #include <SFML/System/Vector2.hpp>
#include "util.hpp" #include "util.hpp"
#include <Old_map.h> #include <Old_Map.h>
Old_Map::Old_Map(sf::Vector3i dim) { Old_Map::Old_Map(sf::Vector3i dim) {
dimensions = dim; dimensions = dim;

Loading…
Cancel
Save