Permalink
Browse files

fix compilation with scons on Mac

  • Loading branch information...
1 parent 0a2a302 commit 4a5226b928bc435af20992c8de3f1a015013e297 @jhasse committed Nov 7, 2012
Showing with 10 additions and 8 deletions.
  1. +3 −2 SConstruct
  2. +0 −4 src/jngl/all.hpp
  3. +2 −1 src/jngl/screen.cpp
  4. +4 −0 src/jngl/window.hpp
  5. +1 −1 src/jngl/work.cpp
View
@@ -111,7 +111,7 @@ if env['PLATFORM'] == 'posix': # Linux
if env['PLATFORM'] == 'darwin': # Mac
env.Append(LIBS=Split('GLEW jpeg ogg vorbisfile webp'),
LIBPATH=Split('/opt/local/lib .'),
- CPPPATH='/opt/local/include/',
+ CPPPATH=['/opt/local/include/', '../boost-libs/include'],
LINKFLAGS='-framework OpenAL -framework OpenGL')
env.ParseConfig('/opt/local/bin/pkg-config --cflags --libs freetype2 libpng')
env.ParseConfig('/opt/local/bin/sdl-config --cflags --libs')
@@ -125,7 +125,8 @@ if env['PLATFORM'] == 'darwin': # Mac
env.Append(CPPPATH='/System/Library/Frameworks/Python.framework/Headers/',
LINKFLAGS='-framework Python',
LIBPATH=Split(". ./lib ./python"),
- LIBS=Split("boost_python"))
+ LIBS=Split("boost_python"),
+ CPPFLAGS='-std=c++11')
env.SharedLibrary(target="python/jngl.so",
source="python/main.cpp")
View
@@ -80,10 +80,6 @@ namespace jngl {
void readPixel(int x, int y, unsigned char& red, unsigned char& green, unsigned char& blue);
- int getWindowWidth();
-
- int getWindowHeight();
-
void setAntiAliasing(bool enabled);
bool getAntiAliasing();
View
@@ -5,7 +5,8 @@ For conditions of distribution and use, see copyright notice in LICENSE.txt
#include "screen.hpp"
#include "types.hpp"
-#include "jngl.hpp"
+#include "screen.hpp"
+#include "window.hpp"
namespace jngl {
Float factor = 1;
View
@@ -18,6 +18,10 @@ namespace jngl {
void hideWindow();
+ int getWindowWidth();
+
+ int getWindowHeight();
+
int getDesktopWidth();
int getDesktopHeight();
View
@@ -3,7 +3,7 @@ Copyright 2012 Jan Niklas Hasse <jhasse@gmail.com>
For conditions of distribution and use, see copyright notice in LICENSE.txt
*/
-#include "jngl.hpp"
+#include "all.hpp"
namespace jngl {
void Work::onQuitEvent() {

0 comments on commit 4a5226b

Please sign in to comment.