Skip to content

Commit

Permalink
Replacing outdated GLEE with generated flextGL files
Browse files Browse the repository at this point in the history
  • Loading branch information
ginkgo committed Dec 18, 2013
1 parent 8b1f46b commit 63f6957
Show file tree
Hide file tree
Showing 10 changed files with 7,436 additions and 22,187 deletions.
10 changes: 4 additions & 6 deletions Pony.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ int main(int argc, char** argv)
glfwSetWindowTitle("Pink Pony <3");
glfwSwapInterval(config.swap_interval);

if (!flextInit()) {
return 1;
}

bool reset_video = false;

Mix_Music* music = NULL;
Expand Down Expand Up @@ -138,12 +142,6 @@ int main(int argc, char** argv)

stop_music(&music);

if (!GLEE_VERSION_2_0) {
cout << endl
<< "Your computer does not support OpenGL 2.0" << endl
<< "OpenGL 2.0 is needed for Pink Pony to work." << endl
<< "Try to update your graphics card's driver. This could help." << endl;
}
glfwTerminate();

return 0;
Expand Down
19 changes: 3 additions & 16 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import os

env = Environment()
env['CC'] = 'g++'
env['CCFLAGS'] = '-Wall -Wextra -Wno-reorder -Wno-unused-parameter -O0 -ggdb -I/usr/include/OpenEXR -I./lib -I./external/tinyXML'
env['CCFLAGS'] = ['-Wall', '-Wextra', '-Wno-reorder', '-Wno-unused-parameter', '-O3']
env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL']
env['CPPPATH'] = ['#/lib', '#/external/tinyXML', '#/flextGL/', '/usr/include/OpenEXR']
env.ParseConfig("pkg-config IlmBase --cflags --libs")
env.ParseConfig("pkg-config libglfw --cflags --libs")
env.ParseConfig("pkg-config ftgl --cflags --libs")
Expand All @@ -27,20 +28,6 @@ env.ParseConfig("pkg-config SDL_mixer --cflags --libs")
env.Command(['lib/mesh.pb.cc', 'lib/mesh.pb.h'], 'mesh.proto',
'protoc --cpp_out=lib mesh.proto')


env.Program('mesh_compile',
['mesh_compile.cc', 'lib/GL/GLee.c']
+ Glob('lib/*cc') + Glob('external/tinyXML/*cpp'))
env.Program('skeleton_compile',
['skeleton_compile.cc', 'lib/GL/GLee.c']
+ Glob('lib/*cc') + Glob('external/tinyXML/*cpp'))

env.Program('Pony',
['Pony.cc', 'lib/GL/GLee.c']
+ Glob('lib/*cc') + Glob('external/tinyXML/*cpp'))
env.Program('MapView',
['MapView.cc', 'lib/GL/GLee.c']
+ Glob('lib/*cc') + Glob('external/tinyXML/*cpp'))
env.Program('ConfigFile',
['ConfigFile.cc', 'lib/GL/GLee.c']
['Pony.cc', 'flextGL/flextGL.c']
+ Glob('lib/*cc') + Glob('external/tinyXML/*cpp'))
692 changes: 692 additions & 0 deletions flextGL/flextGL.c

Large diffs are not rendered by default.

6,719 changes: 6,719 additions & 0 deletions flextGL/flextGL.h

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions glprofile.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file is used as input for flextGLgen.py
# It defines the targetted OpenGL version and lists the used extensions.
# For more information: https://github.com/ginkgo/flextGL

version 2.1 compatibility

extension EXT_framebuffer_object required

extension EXT_geometry_shader4 optional
extension NV_transform_feedback optional
Loading

0 comments on commit 63f6957

Please sign in to comment.