Linux build working

master
MitchellHansen 8 years ago
parent ed651853f6
commit 278c5a37e3

@ -1,8 +1,16 @@
#pragma once #pragma once
#include <string>
#include <SFML/Graphics.hpp>
#include <unordered_map>
#include <iostream>
#include "Vector4.hpp"
#include <string.h>
#ifdef linux #ifdef linux
#include <CL/cl.h> #include <CL/cl.h>
#include <CL/opencl.h> #include <CL/opencl.h>
#include <GL/glx.h>
#elif defined _WIN32 #elif defined _WIN32
#define CL_USE_DEPRECATED_OPENCL_1_2_APIS #define CL_USE_DEPRECATED_OPENCL_1_2_APIS
@ -18,13 +26,6 @@
#include <OpenCL/opencl.h> #include <OpenCL/opencl.h>
#endif #endif
#include <string>
#include <SFML/Graphics.hpp>
#include <unordered_map>
#include <iostream>
#include "Vector4.hpp"
struct device { struct device {
cl_device_id id; cl_device_id id;
@ -112,4 +113,4 @@ private:
bool vr_assert(int error_code, std::string function_name); bool vr_assert(int error_code, std::string function_name);
}; };

@ -5,7 +5,6 @@
#include <chrono> #include <chrono>
#include "util.hpp" #include "util.hpp"
#include <thread> #include <thread>
#include <vector>
#include "OpenCL.h" #include "OpenCL.h"
float elap_time() { float elap_time() {
@ -154,4 +153,4 @@ int main() {
} }
return 0; return 0;
} }

Loading…
Cancel
Save