File Chromium-0.9.dif of Package chromium

--- configure
+++ configure
@@ -2,14 +2,14 @@
 
 ## Minimum versions of libs
 ###################################
-SDL_MIN_VERSION="1.1.6"
+SDL_MIN_VERSION="1.2.0"
 SMPEG_MIN_VERSION="0.4.2"
 
 ## Defaults
 ###################################
 ENABLE_SDL="yes"
 ENABLE_SMPEG="yes"
-ENABLE_VORBIS="no"
+ENABLE_VORBIS="yes"
 ENABLE_SETUP="yes"
 
 ## Where do we look for stuff?
@@ -41,8 +41,8 @@
 	print_message "------------------"
 	if check_for_sdl_config; then
 		print_message "found $SDL_CONFIG"
-		SDL_LIBS="\`\$(SDL_CONFIG) --libs\`"
-		SDL_CFLAGS="\`\$(SDL_CONFIG) --cflags\` -DUSE_SDL"
+		SDL_LIBS="\$(shell \$(SDL_CONFIG) --libs)"
+		SDL_CFLAGS="\$(shell \$(SDL_CONFIG) --cflags) -DUSE_SDL"
 	else
 		print_error "ERROR - sdl-config could not be found in: $std_bin_dirs"
 		print_sdl_error
@@ -72,8 +72,8 @@
 	print_message "--------------------"
 	if check_for_smpeg_config; then
 		print_message "  found $SMPEG_CONFIG"
-		SMPEG_LIBS="\`\$(SMPEG_CONFIG) --libs\`"
-		SMPEG_CFLAGS="\`\$(SMPEG_CONFIG) --cflags\`"
+		SMPEG_LIBS="\$(shell \$(SMPEG_CONFIG) --libs)"
+		SMPEG_CFLAGS="\$(shell \$(SMPEG_CONFIG) --cflags)"
 	else
 		print_warning "WARNING - smpeg-config could not be found in: $std_bin_dirs"
 		print_smpeg_warning
@@ -159,7 +159,7 @@
 ######################################################################
 GL_LIBS="-lglpng -lGL -lGLU -lm"
 AL_LIBS="-L../support/openal/lib -lopenal -ldl" 
-AL_CFLAGS="-I../support/openal/linux/include -I../support/openal/include"
+AL_CFLAGS=""
 
 ## write out config.mak
 ######################################################################
--- src-setup/Audio.cpp
+++ src-setup/Audio.cpp
@@ -7,13 +7,13 @@
  */
 #include "Audio.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #ifndef _WIN32
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -23,6 +23,7 @@
 #include <AL/alc.h>
 #include <AL/alut.h>
 
+
 //====================================================================
 Audio::Audio()
 {
@@ -71,7 +72,14 @@
 	if(!initialized)
 	{
 		fprintf(stderr, "starting OpenAL...");
+#ifdef OLD_OPENAL
 		context_id = alcCreateContext(NULL);
+#else
+		ALCdevice *dev;
+		dev = alcOpenDevice( NULL );
+		context_id = alcCreateContext(dev, NULL);
+		alcMakeContextCurrent(context_id);
+#endif
 		initialized = (bool)context_id;
 		fprintf(stderr, "done.\n");
 
--- src-setup/ConfigFile.cpp
+++ src-setup/ConfigFile.cpp
@@ -7,8 +7,8 @@
  */
 #include "ConfigFile.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include <qapp.h>
 #include <qfiledialog.h>
--- src-setup/HelpPage.cpp
+++ src-setup/HelpPage.cpp
@@ -7,7 +7,7 @@
  */
 #include "HelpPage.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 #include <qwidget.h>
 #include <qapplication.h>
--- src-setup/HiScoreWidget.cpp
+++ src-setup/HiScoreWidget.cpp
@@ -1,7 +1,7 @@
 #include "HiScoreWidget.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include <qfileinfo.h>
 
--- src-setup/HiScoreWidget.h
+++ src-setup/HiScoreWidget.h
@@ -8,7 +8,7 @@
 #ifndef HiScoreWidget_h
 #define HiScoreWidget_h
 
-#include <time.h>
+#include <ctime>
 
 #include <qlabel.h>
 #include <qlayout.h>
--- src-setup/MainWidget.cpp
+++ src-setup/MainWidget.cpp
@@ -7,8 +7,8 @@
  */
 #include "MainWidget.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include <qapp.h>
 #include <qfile.h>
--- src-setup/Makefile
+++ src-setup/Makefile
@@ -10,8 +10,10 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -D_REENTRANT
-CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -D_REENTRANT
+CFLAGS_EXTRA =
+CXXFLAGS_EXTRA=
+CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) $(CFLAGS_EXTRA) -D_REENTRANT
+CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) $(CXXFLAGS_EXTRA) -D_REENTRANT
 INCPATH	=	-I$(QTDIR)/include
 LINK	=	g++
 LFLAGS	=	
--- src-setup/PlayList.cpp
+++ src-setup/PlayList.cpp
@@ -7,8 +7,8 @@
  */
 #include "PlayList.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include <qapp.h>
 #include <qtooltip.h>
--- src/Ammo.cpp
+++ src/Ammo.cpp
@@ -7,7 +7,7 @@
  */
 #include "Ammo.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 
 int ActiveAmmo::ammoCount = 0;
--- src/AudioOpenAL.cpp
+++ src/AudioOpenAL.cpp
@@ -15,14 +15,14 @@
 	void	alcDestroyContext(void*) { alExit(); }
 #endif //macintosh
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdarg>
+#include <cstring>
 
 #ifndef _WIN32
 	#include <unistd.h>
-	#include <errno.h>
+	#include <cerrno>
 	#include <fcntl.h>
 	#include <sys/stat.h>
 	#include <sys/types.h>
--- src/AudioSDLMixer.cpp
+++ src/AudioSDLMixer.cpp
@@ -9,14 +9,14 @@
  
 #include "AudioSDLMixer.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <stdarg.h>
-#include <string.h>
+#include <cstring>
 
 #ifndef _WIN32
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/stat.h>
 #endif // _WIN32
--- src/CHROMIUM.pro
+++ src/CHROMIUM.pro
@@ -34,7 +34,7 @@
 TMAKE_CXXFLAGS	+= $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS)
 
 INCLUDEPATH = ../support/include ../support/glpng/include /usr/X11R6/include
-LIBDIRS		= -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib
+LIBDIRS		= -L../support/glpng/lib -L/usr/X11R6/lib
 LIBS		= $$LIBDIRS $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS)
 #LIBS		= $$LIBDIRS $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS) -lSDL_mixer
 
--- src/Config.cpp
+++ src/Config.cpp
@@ -10,9 +10,9 @@
 #include "HiScore.h"
 
 //====================================================================
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "NCString.h"
 
--- src/EnemyAircraft.cpp
+++ src/EnemyAircraft.cpp
@@ -7,9 +7,9 @@
  */
 #include "EnemyAircraft.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "Config.h"
 
--- src/EnemyAircraft_Boss00.cpp
+++ src/EnemyAircraft_Boss00.cpp
@@ -7,9 +7,9 @@
  */
 #include "EnemyAircraft_Boss00.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "Config.h"
 
--- src/EnemyAircraft_Boss01.cpp
+++ src/EnemyAircraft_Boss01.cpp
@@ -7,9 +7,9 @@
  */
 #include "EnemyAircraft_Boss01.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "Config.h"
 
--- src/EnemyAircraft_Gnat.cpp
+++ src/EnemyAircraft_Gnat.cpp
@@ -7,9 +7,9 @@
  */
 #include "EnemyAircraft_Gnat.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "Config.h"
 
--- src/EnemyAircraft_Omni.cpp
+++ src/EnemyAircraft_Omni.cpp
@@ -7,9 +7,9 @@
  */
 #include "EnemyAircraft_Omni.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "Config.h"
 
--- src/EnemyAircraft_RayGun.cpp
+++ src/EnemyAircraft_RayGun.cpp
@@ -7,9 +7,9 @@
  */
 #include "EnemyAircraft_RayGun.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "Config.h"
 
--- src/EnemyAircraft_Straight.cpp
+++ src/EnemyAircraft_Straight.cpp
@@ -7,9 +7,9 @@
  */
 #include "EnemyAircraft_Straight.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "Config.h"
 
--- src/EnemyAircraft_Tank.cpp
+++ src/EnemyAircraft_Tank.cpp
@@ -7,9 +7,9 @@
  */
 #include "EnemyAircraft_Tank.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "Config.h"
 
--- src/EnemyAmmo.cpp
+++ src/EnemyAmmo.cpp
@@ -7,9 +7,9 @@
  */
 #include "EnemyAmmo.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/EnemyFleet.cpp
+++ src/EnemyFleet.cpp
@@ -7,8 +7,8 @@
  */
 #include "EnemyFleet.h"
 
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/Explosions.cpp
+++ src/Explosions.cpp
@@ -7,7 +7,7 @@
  */
 #include "Explosions.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/Global.h
+++ src/Global.h
@@ -8,8 +8,8 @@
 #ifndef Global_h
 #define Global_h
 
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 
 #include "define.h"
 #include "TexFont.h"
--- src/GroundMetal.cpp
+++ src/GroundMetal.cpp
@@ -8,7 +8,7 @@
 #include "GroundMetal.h"
 
 #include <GL/glpng.h>
-#include <math.h>
+#include <cmath>
 
 #include "extern.h"
 #include "Global.h"
--- src/GroundMetalSegment.cpp
+++ src/GroundMetalSegment.cpp
@@ -7,7 +7,7 @@
  */
 #include "GroundMetalSegment.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/GroundSea.cpp
+++ src/GroundSea.cpp
@@ -7,7 +7,7 @@
  */
 #include "GroundSea.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <GL/glpng.h>
 
 #include "extern.h"
--- src/GroundSeaSegment.cpp
+++ src/GroundSeaSegment.cpp
@@ -7,7 +7,7 @@
  */
 #include "GroundSeaSegment.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/HeroAircraft.cpp
+++ src/HeroAircraft.cpp
@@ -7,9 +7,9 @@
  */
 #include "HeroAircraft.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/HeroAmmo.cpp
+++ src/HeroAmmo.cpp
@@ -7,8 +7,8 @@
  */
 #include "HeroAmmo.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/HiScore.cpp
+++ src/HiScore.cpp
@@ -11,9 +11,11 @@
 #include "HeroAircraft.h"
 
 //====================================================================
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#define CHROMIUM_SCORE "/var/games/chromium.highscore"
 
 HiScore	*HiScore::instance = 0;
 
@@ -148,7 +150,7 @@
 const char *HiScore::getFileName()
 {
 	static char	configFilename[256];
-	const char *envFile = getenv("CHROMIUM_SCORE");
+	const char *envFile = CHROMIUM_SCORE;
 	if(envFile && strlen(envFile) < 256)
 	{
 		strcpy(configFilename, envFile);
--- src/HiScore.h
+++ src/HiScore.h
@@ -8,8 +8,8 @@
 #ifndef HiScore_h
 #define HiScore_h
 
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 
 #include "define.h"
 
--- src/MainGL.cpp
+++ src/MainGL.cpp
@@ -7,10 +7,10 @@
  */
 #include "MainGL.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/MainGLUT.cpp
+++ src/MainGLUT.cpp
@@ -9,7 +9,7 @@
 
 #ifdef USE_GLUT
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 #include <GL/glut.h>
--- src/MainSDL.cpp
+++ src/MainSDL.cpp
@@ -9,8 +9,8 @@
 
 #ifdef USE_SDL
 
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 #include <SDL.h>
 
 #include "compatibility.h"
--- src/MainSDL_Event.cpp
+++ src/MainSDL_Event.cpp
@@ -9,9 +9,9 @@
 
 #ifdef USE_SDL
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include "Config.h"
 
--- src/Makefile
+++ src/Makefile
@@ -10,12 +10,14 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
-CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
+CFLAGS_EXTRA  =
+CXXFLAGS_EXTRA=
+CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) $(CFLAGS_EXTRA) -DAUDIO_OPENAL -D_REENTRANT
+CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) $(CXXFLAGS_EXTRA) -DAUDIO_OPENAL -D_REENTRANT
 INCPATH	=	-I../support/include -I../support/glpng/include -I/usr/X11R6/include
 LINK	=	g++
 LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS)
+LIBS	=	$(SUBLIBS) -L../support/glpng/lib -L/usr/X11R6/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS)
 MOC	=	$(QTDIR)/bin/moc
 UIC	=	$(QTDIR)/bin/uic
 
--- src/MenuGL.cpp
+++ src/MenuGL.cpp
@@ -7,9 +7,9 @@
  */
 #include "MenuGL.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/NCString.cpp
+++ src/NCString.cpp
@@ -1,10 +1,11 @@
 #include "NCString.h"
 
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
+#include <cstdio>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
+#include <cstdarg>
 
 /**
  * ctor
@@ -1463,7 +1464,7 @@
 NCString operator + (const char 	*s1, const NCString &s2)   {   NCString tmp(s1);   tmp += s2;  return tmp; }
 NCString operator + (const NCString &s1, const char 	*s2)   {   NCString tmp(s1);   tmp += s2;  return tmp; }
 //-----------------------------------------------------
-ostream& operator << (ostream &os, const NCString &s1)
+std::ostream& operator << (std::ostream &os, const NCString &s1)
 {
 	return os << (const char*)s1;
 }
--- src/NCString.h
+++ src/NCString.h
@@ -1,7 +1,7 @@
 #ifndef NCString_h
 #define NCString_h
 
-#include <stream.h>
+#include <iostream>
 
 typedef unsigned int uint;
 typedef unsigned short ushort;
@@ -123,7 +123,7 @@
 /** add     @relates NCString */	NCString operator + (const NCString &s1, const NCString &s2);
 /** add     @relates NCString */	NCString operator + (const char     *s1, const NCString &s2);
 /** add     @relates NCString */	NCString operator + (const NCString &s1, const char     *s2);
-/** stream  @relates NCString */	ostream& operator << (ostream &os, const NCString &s1);
+/** stream  @relates NCString */	std::ostream& operator << (std::ostream &os, const NCString &s1);
 
 #endif // NCString_h
 
--- src/PowerUps.cpp
+++ src/PowerUps.cpp
@@ -7,9 +7,9 @@
  */
 #include "PowerUps.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/ScreenItem.cpp
+++ src/ScreenItem.cpp
@@ -7,7 +7,7 @@
  */
 #include "ScreenItem.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 
 int ScreenItem::itemCount = 0;
--- src/ScreenItemAdd.cpp
+++ src/ScreenItemAdd.cpp
@@ -7,8 +7,8 @@
  */
 #include "ScreenItemAdd.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "define.h"
 #include "Global.h"
--- src/StatusDisplay.cpp
+++ src/StatusDisplay.cpp
@@ -7,10 +7,10 @@
  */
 #include "StatusDisplay.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 
 #include "compatibility.h"
 #include <GL/gl.h>
--- src/TexFont.cpp
+++ src/TexFont.cpp
@@ -5,12 +5,12 @@
    provided without guarantee or warrantee expressed or  implied. This
    program is -not- in the public domain. */
 #include "compatibility.h"
-#include <assert.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include <cassert>
+#include <cctype>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
 #include <GL/glu.h>
 #include "TexFont.h"
 
--- src/extern.h
+++ src/extern.h
@@ -8,7 +8,7 @@
 #ifndef extern_h
 #define extern_h
 
-#include <stdio.h>
+#include <cstdio>
 
 const char *dataLoc(const char *filename, bool doCheck = true);
 const char *alterPathForPlatform(char *filename);
--- src/main.cpp
+++ src/main.cpp
@@ -8,15 +8,15 @@
 #include "compatibility.h"
 #include <GL/gl.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
 
 #ifndef _WIN32
 #include <unistd.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 #include <sys/stat.h>
 #endif // _WIN32
 
@@ -31,7 +31,7 @@
 
 #include "EnemyAircraft.h"
 
-static char dataDir[256] = "../data";
+static char dataDir[256] = "/usr/share/games/Chromium";
 
 //----------------------------------------------------------
 int main(int argc, char **argv)
@@ -108,7 +108,7 @@
 			exit(0);
 		}
 	}
-	
+/*	
 #ifdef PKGDATADIR
 	strcpy(dataDir, PKGDATADIR);
 	strcat(dataDir, "/data");
@@ -131,8 +131,9 @@
 		fprintf(stderr, "!! 		  (using %s)\n", dataDir);
 		fprintf(stderr, "!!\n");
 	}
-#endif
 
+#endif
+*/
 	srand(time(NULL));
 	
 	game->generateRandom();
--- support/glpng/include/GL/glpng.h
+++ support/glpng/include/GL/glpng.h
@@ -23,7 +23,11 @@
 #ifndef _GLPNG_H_
 #define _GLPNG_H_
 
-#include <stdio.h>
+#ifdef __cplusplus
+#  include <cstdio>
+#else
+#  include <stdio.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
--- support/glpng/src/Makefile
+++ support/glpng/src/Makefile
@@ -9,9 +9,11 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	-pipe -O2
-CXXFLAGS=	-pipe -O2
-INCPATH	=	-I../include -I/usr/include -I/usr/X11R6/include
+CFLAGS_EXTRA =
+CXXFLAGS_EXTRA =
+CFLAGS	=	-pipe $(CFLAGS_EXTRA)
+CXXFLAGS=	-pipe $(CXXFLAGS_EXTRA)
+INCPATH	=	-I../include -I/usr/X11R6/include
 AR	=	ar cqs
 RANLIB	=	
 MOC	=	$(QTDIR)/bin/moc
--- support/glpng/src/Makefile.LINUX
+++ support/glpng/src/Makefile.LINUX
@@ -9,9 +9,11 @@
 
 CC	=	gcc
 CXX	=	g++
-CFLAGS	=	-pipe -O2
-CXXFLAGS=	-pipe -O2
-INCPATH	=	-I../include -I/usr/include -I/usr/X11R6/include
+CFLAGS_EXTRA =
+CXXFLAGS_EXTRA =
+CFLAGS	=	-pipe $(CFLAGS_EXTRA)
+CXXFLAGS=	-pipe $(CXXFLAGS_EXTRA)
+INCPATH	=	-I../include -I/usr/X11R6/include
 AR	=	ar cqs
 RANLIB	=	
 MOC	=	$(QTDIR)/bin/moc
--- support/glpng/src/glpng.c
+++ support/glpng/src/glpng.c
@@ -4,6 +4,8 @@
 #endif
 
 #include <GL/glpng.h>
+/* needed to get the glext prototypes */
+#define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
 #include <stdlib.h>
 #include <math.h>
@@ -47,7 +49,7 @@
 
 static char gammaExplicit = 0;	/*if  */
 
-static void checkForGammaEnv()
+static void checkForGammaEnv(void)
 {
 	double viewingGamma;
 	char *gammaEnv = getenv("VIEWING_GAMMA");
@@ -91,6 +93,7 @@
 	}
 }
 
+#ifdef _WIN32
 static int ExtSupported(const char *x) {
 	static const GLubyte *ext = NULL;
 	const char *c;
@@ -107,6 +110,7 @@
 
 	return 0;
 }
+#endif
 
 #define GET(o) ((int)*(data + (o)))
 
--- src/AudioOpenAL.cpp	2003-12-17 16:14:38.000000000 +0000
+++ src/AudioOpenAL.cpp	2003-12-17 16:24:05.000000000 +0000
@@ -124,6 +124,7 @@
 			audioScale[0] = 0.5;
 			audioScale[1] = 0.3;
 			audioScale[2] = 0.3;
+			alDistanceModel(AL_NONE); 
 		}
 
 		if(config->swapStereo())