Skip to content

Commit

Permalink
Remove GLEW
Browse files Browse the repository at this point in the history
  • Loading branch information
fluffyfreak committed Nov 29, 2014
1 parent 40353db commit a3d8985
Show file tree
Hide file tree
Showing 32 changed files with 93 additions and 39,586 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ before_install:
- cd pioneer-thirdparty/ && autoconf && ./configure && make assimp && make sdl2 && make sdl2_image && cd ../
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -qq
- sudo apt-get install -qq mesa-common-dev libfreetype6-dev libfreeimage-dev libglew-dev libsigc++-2.0-dev libvorbis-dev gcc-4.8 g++-4.8
- sudo apt-get install -qq mesa-common-dev libfreetype6-dev libfreeimage-dev libsigc++-2.0-dev libvorbis-dev gcc-4.8 g++-4.8
- sudo rm /usr/bin/gcc /usr/bin/g++
- sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
- sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++
6 changes: 0 additions & 6 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@ Pioneer includes the following third-party software:
Copyright (C) 1994-2012 Lua.org, PUC-Rio
Licensed under the MIT licence (see contrib/lua/lua.h)

GLEW: The OpenGL Extension Wrangler
Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
Copyright (C) 2002, Lev Povalahev
Licensed under the Modified BSD licence (see licenses/GLEW.txt)

miniz by Rich Geldreich, April 2012
Public domain (see contrib/miniz/miniz.h)

Expand Down
4 changes: 1 addition & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,9 @@ AC_ARG_WITH([extra-version], AS_HELP_STRING([--with-extra-version], [Additional

EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DPIONEER_VERSION=\\\"$PIONEER_VERSION\\\" -DPIONEER_EXTRAVERSION=\\\"$PIONEER_EXTRAVERSION\\\""

dnl GLEW_STATIC is defined so that the GLEW header provides declarations with the correct linkage
dnl __STDC_LIMIT_MACROS is defined so that GCC 4.7 will provide limit macros (eg, INT64_MAX) as part of cstdint
dnl (note, __STDC_LIMIT_MACROS is not needed in GCC 4.8 or later; those macros are part of the C++11 standard)
EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -DGLEW_STATIC -D__STDC_LIMIT_MACROS"
EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -D__STDC_LIMIT_MACROS"


dnl Compiler warning options
Expand Down Expand Up @@ -411,7 +410,6 @@ AC_CONFIG_FILES([
contrib/json/Makefile
contrib/PicoDDS/Makefile
contrib/vcacheopt/Makefile
contrib/glew/Makefile
contrib/profiler/Makefile
osx/Makefile
win32/Makefile])
Expand Down
2 changes: 1 addition & 1 deletion contrib/Makefile.am
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SUBDIRS = lua miniz jenkins json PicoDDS vcacheopt glew profiler
SUBDIRS = lua miniz jenkins json PicoDDS vcacheopt profiler
6 changes: 0 additions & 6 deletions contrib/glew/Makefile.am

This file was deleted.

Loading

0 comments on commit a3d8985

Please sign in to comment.