Permalink
Browse files

updated for MinGW 4.6.2

  • Loading branch information...
1 parent b872bcb commit 9692b2b75ecf4f0716441e1459eb26a717966354 @jhasse committed Jan 7, 2012
Showing with 647 additions and 25 deletions.
  1. +4 −4 SConstruct
  2. BIN glew32.dll
  3. +638 −19 include/GL/glew.h
  4. +2 −0 installer/mingw.nsi.in
  5. BIN lib/glew32s.lib
  6. BIN lib/libglew32.dll.a
  7. +3 −2 main.cpp
View
@@ -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,
View
Binary file not shown.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -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
View
Binary file not shown.
View
Binary file not shown.
View
@@ -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)
{

0 comments on commit 9692b2b

Please sign in to comment.