Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games/pink-pony: make compatible with Imath 3.0, update glfw dep
The LIB_DEPENDS on glfw2 was tightened up to check the .so major version component, to avoid it picking up the incompatible glfw (3). Reported by: Koichiro Iwao (meta@)
- Loading branch information
Showing
3 changed files
with
19 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,20 @@ | ||
--- SConstruct.orig 2014-01-01 01:39:36 UTC | ||
+++ SConstruct | ||
@@ -3,11 +3,10 @@ import os | ||
@@ -3,13 +3,12 @@ import os | ||
optimization_flags = ['-O3'] | ||
#optimization_flags = ['-O0', '-ggdb'] | ||
|
||
-env = Environment() | ||
+env = Environment(ENV=os.environ, **dict((k, v.split()) for k, v in ARGUMENTS.items())) | ||
-env['CC'] = 'g++' | ||
-env['CCFLAGS'] = ['-Wall', '-Wextra', '-Wno-reorder', '-Wno-unused-parameter'] + optimization_flags | ||
+env = Environment(ENV=os.environ, **dict((k, v.split()) for k, v in ARGUMENTS.items())) | ||
+env.Append(CCFLAGS = ['-Wall', '-Wextra', '-Wno-reorder', '-Wno-unused-parameter']) | ||
env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL'] | ||
-env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/', '/usr/include/OpenEXR'] | ||
+env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/'] | ||
|
||
env.ParseConfig("pkg-config IlmBase --cflags --libs") | ||
-env.ParseConfig("pkg-config IlmBase --cflags --libs") | ||
+env.ParseConfig("pkg-config Imath --cflags --libs") | ||
env.ParseConfig("pkg-config libglfw --cflags --libs") | ||
env.ParseConfig("pkg-config ftgl --cflags --libs") | ||
env.ParseConfig("pkg-config sigc++-2.0 --cflags --libs") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
--- src/Line.cc.orig 2014-01-01 01:39:36 UTC | ||
+++ src/Line.cc | ||
@@ -1,5 +1,5 @@ | ||
#include "Line.hh" | ||
-#include <ImathLimits.h> | ||
+#include <halfLimits.h> | ||
|
||
#define EPSILON limits<double>::epsilon() | ||
|