From 20ad76f86df20ee65257fefa7c7b4d759a029fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Ortega=20Froysa?= Date: Thu, 25 Oct 2018 20:13:12 +0200 Subject: [PATCH] Change global to C header file. --- CMakeLists.txt | 2 +- src/{globals.hpp => globals.h} | 2 ++ src/main.cpp | 2 +- src/simulation.cpp | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) rename src/{globals.hpp => globals.h} (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31f2dca..623d22d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ # distribution. cmake_minimum_required(VERSION 2.8) -project(TrippyCube CXX) +project(TrippyCube C CXX) # Binary filename set(TARGET_NAME "trippy-cube") diff --git a/src/globals.hpp b/src/globals.h similarity index 98% rename from src/globals.hpp rename to src/globals.h index 81cac89..71afa83 100644 --- a/src/globals.hpp +++ b/src/globals.h @@ -34,6 +34,8 @@ #define SCREEN_WIDTH 800 #define SCREEN_HEIGHT 600 +extern "C" { extern SDL_Window *window; extern GLuint program_id; extern GLuint matrix_id; +} diff --git a/src/main.cpp b/src/main.cpp index f06174a..7562e8d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,7 @@ #include #include -#include "globals.hpp" +#include "globals.h" #include "shaders.hpp" #include "simulation.hpp" diff --git a/src/simulation.cpp b/src/simulation.cpp index f9d6225..0c7364e 100644 --- a/src/simulation.cpp +++ b/src/simulation.cpp @@ -29,7 +29,7 @@ #include #include -#include "globals.hpp" +#include "globals.h" #include "input.hpp" #include "camera.hpp" #include "cube.hpp"