nortega/trippy-cube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change global to C header file.

Browse Source
This commit is contained in:
Nicolás Ortega Froysa 2018-10-25 20:13:12 +02:00
parent 6e25741cc9
commit 20ad76f86d
No known key found for this signature in database
GPG Key ID: FEC70E3BAE2E69BF
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -21,7 +21,7 @@
# distribution. # distribution.
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(TrippyCube CXX) project(TrippyCube C CXX)
# Binary filename # Binary filename
set(TARGET_NAME "trippy-cube") set(TARGET_NAME "trippy-cube")

2
src/globals.hpp → src/globals.h
View File

@ -34,6 +34,8 @@
#define SCREEN_WIDTH 800 #define SCREEN_WIDTH 800
#define SCREEN_HEIGHT 600 #define SCREEN_HEIGHT 600
extern "C" {
extern SDL_Window *window; extern SDL_Window *window;
extern GLuint program_id; extern GLuint program_id;
extern GLuint matrix_id; extern GLuint matrix_id;
}

2
src/main.cpp
View File

@ -28,7 +28,7 @@
#include <GL/glew.h> #include <GL/glew.h>
#include <GL/gl.h> #include <GL/gl.h>
#include "globals.hpp" #include "globals.h"
#include "shaders.hpp" #include "shaders.hpp"
#include "simulation.hpp" #include "simulation.hpp"

2
src/simulation.cpp
View File

@ -29,7 +29,7 @@
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include "globals.hpp" #include "globals.h"
#include "input.hpp" #include "input.hpp"
#include "camera.hpp" #include "camera.hpp"
#include "cube.hpp" #include "cube.hpp"