echoes91
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'johnbartholomew/bundle-glew' into bundle-glew 

Conflicts:
	COMPILING.txt
	Makefile.common
	configure.ac
	src/Makefile.am
master
Robert Norris 2013-09-08 14:00:20 +10:00
parent b4c6a5d00b f46b92e328
commit ae3f9551dd
14 changed files with 39370 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
COMPILING.txt
View File

@ -40,7 +40,6 @@ Linux - Autotools
libvorbis-dev
libpng-dev
libassimp-dev >= 3.0
libglew-dev
mesa-common-dev
If your platform doesn't have assimp 3.0, you'll need to build it from
@ -77,7 +76,7 @@ Windows - Autotools (Linux cross-compile)
Now compile GCC and the dependencies needed for Pioneer:
make gcc freetype glew sdl sdl_image vorbis libsigc++
make gcc freetype sdl sdl_image vorbis libsigc++
2. Prepare the pioneer-thirdparty repository. See below.
@ -107,7 +106,6 @@ OS X - Autotools
libsdl
libsdl_image
libsdl_sound
glew
libsigcxx2
libvorbis
autoconf

2
Makefile.common
View File

@ -1,6 +1,6 @@
AM_CPPFLAGS = $(EXTRA_CPPFLAGS)
AM_CFLAGS = $(EXTRA_CFLAGS)
AM_CXXFLAGS = $(FREETYPE_CFLAGS) $(GL_CFLAGS) $(GLEW_CFLAGS) \
AM_CXXFLAGS = $(FREETYPE_CFLAGS) $(GL_CFLAGS) \
$(LUA_CFLAGS) $(SDL_CFLAGS) $(SIGC_CFLAGS) $(EXTRA_CXXFLAGS) \
$(LIBPNG_CFLAGS) $(ASSIMP_CFLAGS)
CFLAGS += $(OPTIMISE)

4
configure.ac
View File

@ -297,11 +297,8 @@ dnl Check for OpenGL libs
if test "x$MXE_CROSS" = "xyes" ; then
AC_SUBST([GL_CFLAGS], [])
AC_SUBST([GL_LIBS], [-lopengl32])
AC_SUBST([GLEW_CFLAGS], [-DGLEW_BUILD])
AC_SUBST([GLEW_LIBS], [-lglew32s])
else
PIONEER_CHECK_LIB([GL], [gl], [GL], [glBegin])
PIONEER_CHECK_LIB([GLEW], [glew], [GLEW], [glewInit])
fi
dnl ###########################################################################
@ -380,6 +377,7 @@ AC_CONFIG_FILES([
contrib/json/Makefile
contrib/PicoDDS/Makefile
contrib/vcacheopt/Makefile
contrib/glew/Makefile
osx/Makefile
win32/Makefile])
AC_OUTPUT

2
contrib/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = lua miniz jenkins json PicoDDS vcacheopt
SUBDIRS = lua miniz jenkins json PicoDDS vcacheopt glew

6
contrib/glew/Makefile.am Normal file
View File

@ -0,0 +1,6 @@
# Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.common
noinst_LIBRARIES = libglew.a
libglew_a_SOURCES = glew.c
noinst_HEADERS = glew.h glxew.h wglew.h

18123
contrib/glew/glew.c Normal file
View File

File diff suppressed because it is too large Load Diff

18062
contrib/glew/glew.h Normal file
View File

File diff suppressed because it is too large Load Diff

1669
contrib/glew/glxew.h Normal file
View File

File diff suppressed because it is too large Load Diff

1421
contrib/glew/wglew.h Normal file
View File

File diff suppressed because it is too large Load Diff

73
licenses/GLEW.txt Normal file
View File

@ -0,0 +1,73 @@
The OpenGL Extension Wrangler Library
Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
Copyright (C) 2002, Lev Povalahev
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* The name of the author may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
Mesa 3-D graphics library
Version: 7.0
Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Copyright (c) 2007 The Khronos Group Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
"Materials"), to deal in the Materials without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Materials, and to
permit persons to whom the Materials are furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Materials.
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

15
src/Makefile.am
View File

@ -312,10 +312,11 @@ pioneer_LDADD = \
../contrib/miniz/libminiz.a \
../contrib/PicoDDS/libpicodds.a \
../contrib/jenkins/libjenkins.a \
../contrib/json/libjson.a
../contrib/json/libjson.a \
../contrib/glew/libglew.a
pioneer_LDADD += \
$(FREETYPE_LIBS) $(GLEW_LIBS) $(GL_LIBS) \
$(FREETYPE_LIBS) $(GL_LIBS) \
$(SDL_LIBS) $(SIGC_LIBS) $(LUA_LIBS) $(VORBIS_LIBS) \
$(PNG_LIBS) $(ASSIMP_LIBS) $(EXTRA_LIBS)
@ -388,10 +389,11 @@ uitest_LDADD = \
graphics/libgraphics.a \
posix/libposix.a \
../contrib/jenkins/libjenkins.a \
../contrib/PicoDDS/libpicodds.a
../contrib/PicoDDS/libpicodds.a \
../contrib/glew/libglew.a
uitest_LDADD += \
$(FREETYPE_LIBS) $(GLEW_LIBS) $(GL_LIBS) \
$(FREETYPE_LIBS) $(GL_LIBS) \
$(SDL_LIBS) $(SIGC_LIBS) $(LUA_LIBS) $(PNG_LIBS)
if !HAVE_LUA
@ -414,10 +416,11 @@ textstress_LDADD = \
text/libtext.a \
graphics/libgraphics.a \
posix/libposix.a \
../contrib/PicoDDS/libpicodds.a
../contrib/PicoDDS/libpicodds.a \
../contrib/glew/libglew.a
textstress_LDADD += \
$(FREETYPE_LIBS) $(GLEW_LIBS) $(GL_LIBS) \
$(FREETYPE_LIBS) $(GL_LIBS) \
$(SDL_LIBS) $(SIGC_LIBS) $(LUA_LIBS) $(PNG_LIBS)
if !HAVE_LUA

2
src/graphics/TextureGL.h
View File

@ -5,7 +5,7 @@
#define _TEXTUREGL_H
#include "Texture.h"
#include <GL/glew.h>
#include "glew/glew.h"
namespace Graphics {

3
src/libs.h
View File

@ -10,7 +10,6 @@
#include <cstdio>
#include <sigc++/sigc++.h>
#include <SDL.h>
#include <GL/glew.h>
#include <SDL_image.h>
#include <cfloat>
#include <limits>
@ -23,6 +22,8 @@
#include <map>
#include <algorithm>
#include "glew/glew.h"
#ifdef _WIN32
# include <malloc.h>

1
src/utils.h
View File

@ -8,7 +8,6 @@
#include <vector>
#include <stdio.h>
#include <stdarg.h>
#include <GL/glew.h>
#include "libs.h"
#ifndef __GNUC__