updated for MinGW 4.6.2

jhasse · Jan 7, 2012 · 9692b2b · 9692b2b
1 parent b872bcb
commit 9692b2b
Show file tree

Hide file tree

Showing 7 changed files with 647 additions and 25 deletions.
diff --git a/SConstruct b/SConstruct
@@ -2,7 +2,7 @@
 
 import os
 
-version = "0.9.5"
+version = "0.9.6"
 
 #Replace @VERSION@ in certain files
 files = ["jngl.pc.in", "autopackage/default.apspec.in", "installer/mingw.nsi.in", 'installer/msvc.nsi.in', 'installer/python.nsi.in']
@@ -58,14 +58,14 @@ window.cpp
 windowptr.cpp
 framebuffer.cpp
 framebufferimpl.cpp
-"""), CPPFLAGS="-std=c++0x")
+"""), CPPFLAGS="-std=gnu++0x")
 source_files += Split("""
 callbacks.c
 ConvertUTF.c
 """)
 
 if env['PLATFORM'] == 'win32': # Windows
-	jnglLibs = Split("freetype png opengl32 glu32 user32 shell32 gdi32 z jpeg dl")
+	jnglLibs = Split("glew32 freetype png opengl32 glu32 user32 shell32 gdi32 z jpeg dl")
 	if int(python) or int(msvc):
 		jnglLibs += Split("openal32 ogg vorbisfile")
 	else:
@@ -77,7 +77,7 @@ if env['PLATFORM'] == 'win32': # Windows
 		linkflags = ""
 	libs = Split("jngl") + jnglLibs
 	env.Program("test.cpp",
-	            CPPFLAGS="-std=c++0x",
+	            CPPFLAGS="-std=gnu++0x",
 	            CPPPATH=".",
 				LIBPATH=Split(". ./lib"),
 				LIBS=libs,

diff --git a/glew32.dll b/glew32.dll
diff --git a/include/GL/glew.h b/include/GL/glew.h
diff --git a/installer/mingw.nsi.in b/installer/mingw.nsi.in
@@ -30,9 +30,11 @@ File ..\lib\libpng.a
 File ..\lib\libz.a
 File ..\lib\libjpeg.a
 File ..\lib\libdl.a
+File ..\lib\libglew32.dll.a
 SetOutPath $INSTDIR\bin
 File ..\vorbis.dll
 File ..\vorbisfile.dll
 File ..\ogg.dll
+File ..\glew32.dll
 
 SectionEnd
diff --git a/lib/glew32s.lib b/lib/glew32s.lib
diff --git a/lib/libglew32.dll.a b/lib/libglew32.dll.a
diff --git a/main.cpp b/main.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright 2007-2011 Jan Niklas Hasse <jhasse@gmail.com>
+Copyright 2007-2012 Jan Niklas Hasse <jhasse@gmail.com>
 
 This file is part of JNGL.
 
@@ -21,7 +21,6 @@ along with JNGL.  If not, see <http://www.gnu.org/licenses/>.
 #include "window.hpp"
 #include "debug.hpp"
 #include "sprite.hpp"
-#include "audio.hpp"
 #include "windowptr.hpp"
 #include "draw.hpp"
 #include "opengl.hpp"
@@ -397,6 +396,8 @@ namespace jngl
 	{
 		return antiAliasingEnabled;
 	}
+
+	void LoadSound(const std::string&); // definied in audio.cpp
 
 	void Load(const std::string& filename)
 	{