Source Cleanup

Makefile.am

@@ -3,7 +3,7 @@
 ## If you don't want it to overwrite it,
 ## 	Please disable it in the Anjuta project configuration
 
-SUBDIRS = src data
+SUBDIRS = include src data
 
 bomberclonedocdir = ${prefix}/doc/bomberclone
 bomberclonedoc_DATA = \

bomberclone.prj

@@ -55,7 +55,7 @@ project.excluded.modules=intl
 project.config.extra.modules.before=
 project.config.extra.modules.after=
 project.config.blocked=0
-project.config.disable.overwriting=1 1 1 0 0 0 1 0 0 
+project.config.disable.overwriting=1 1 1 1 1 1 1 1 1 
 
 project.menu.entry=bomberclone
 project.menu.group=Games
@@ -80,53 +80,53 @@ preferences.help.browser=devhelp -s '$(current.file.selection)'
 
 module.include.name=include
 module.include.type=
-module.include.expanded=0
+module.include.expanded=1
-module.include.files=
+module.include.files=\
+	basic.h\
+	bomberclone.h\
+	chat.h\
+	gamesrv.h\
+	font.h\
+	gfx.h\
+	keybinput.h\
+	map.h\
+	network.h\
+	packets.h\
+	sound.h\
+	sysfunc.h
 
 module.source.name=src
 module.source.type=
 module.source.expanded=1
 module.source.files=\
-	main.c\
+	sysfunc.c\
-	bomb.c\
+	udp.c\
-	bomberclone.h\
+	tileset.c\
+	special.c\
+	sound.c\
+	configuration.c\
+	chat.c\
 	debug.c\
-	packets.c\
+	field.c\
 	font.c\
-	gfx.c\
+	bomb.c\
-	player.c\
-	packets.h\
 	game.c\
-	netmenu.c\
-	network.c\
-	menu.c\
-	field.c\
-	network.h\
-	configuration.c\
-	udp.c\
-	sysfunc.c\
-	pkgcache.c\
-	gamesrv.h\
 	gamesrv.c\
-	gfx.h\
+	gfx.c\
-	basic.h\
+	gfxengine.c\
-	chat.c\
+	gfxpixelimage.c\
-	multiwait.c\
-	chat.h\
 	keybinput.c\
-	keybinput.h\
+	main.c\
-	single.c\
-	sysfunc.h\
-	mapmenu.c\
-	special.c\
-	sound.h\
-	sound.c\
-	font.h\
 	map.c\
-	tileset.c\
+	mapmenu.c\
-	map.h\
+	menu.c\
-	gfxpixelimage.c\
+	multiwait.c\
-	gfxengine.c
+	netmenu.c\
+	network.c\
+	packets.c\
+	pkgcache.c\
+	player.c\
+	single.c
 
 module.pixmap.name=pixmaps
 module.pixmap.type=

configure.in

@@ -43,15 +43,67 @@ case "$target" in
     *cygwin* | *mingw32* | *mingw32msvc* )
         CFLAGS="$CFLAGS"
         LIBS="$LIBS -liberty -lwsock32"
+        MATHLIB=""
+        SYS_GL_LIBS="-lopengl32 -lglu32"
         ;;
     *solaris* )
 		CFLAGS="$CFLAGS"
 		LIBS="$LIBS -lsocket -lnsl -lm"
-		;;
+        MATHLIB="-lm"
+        AC_PATH_X
+        AC_PATH_XTRA
+        if test x$have_x = xyes; then
+            CFLAGS="$CFLAGS $X_CFLAGS"
+            SYS_GL_LIBS="$X_LIBS -lGL -lGLU"
+        else
+            SYS_GL_LIBS="-lGL -lGLU"
+        fi
+        ;;
+    *)
+        MATHLIB="-lm"
+        AC_PATH_X
+        AC_PATH_XTRA
+        if test x$have_x = xyes; then
+            CFLAGS="$CFLAGS $X_CFLAGS"
+            SYS_GL_LIBS="$X_LIBS -lGL -lGLU"
+        else
+            SYS_GL_LIBS="-lGL -lGLU"
+        fi
+        ;;
 esac
 	CFLAGS="$CFLAGS -Wall"
 
 
+AC_SUBST(MATHLIB)
+
+
+
+dnl Check for OpenGL ***********************+
+AC_MSG_CHECKING(for OpenGL support)
+have_opengl=no
+AC_TRY_COMPILE([
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glu.h>
+ #else
+ #include <GL/gl.h>
+ #include <GL/glu.h>
+ #endif
+],[
+],[
+have_opengl=yes
+])
+AC_MSG_RESULT($have_opengl)
+if test x$have_opengl = xyes; then
+    CFLAGS="$CFLAGS"
+    LIBS="$LIBS $SYS_GL_LIBS"
+    AC_DEFINE(HAVE_OPENGL, [1], [OpenGL Headers found])
+else
+    AC_MSG_WARN(Unable to find OpenGL headers and libraries)
+fi
+
+
+
 dnl SDL_mixer **********************************
 AC_ARG_WITH(sdlmixer-prefix, [  --with-sdlmixer-prefix=PFX prefix where SDL_mixer library is installed], sdlmixer_prefix="$withval", sdlmixer_prefix="")
 
@@ -139,5 +191,6 @@ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
 AC_OUTPUT([
 Makefile
 src/Makefile
+include/Makefile
 data/Makefile
 ])

include/Makefile.am

@@ -0,0 +1,22 @@
+## Process this file with automake to produce Makefile.in
+
+## Created by Anjuta - will be overwritten
+## If you don't want it to overwrite it,
+## 	Please disable it in the Anjuta project configuration
+
+bomberclone_includedir = $(pkgincludedir)
+
+bomberclone_include_DATA = \
+	basic.h \
+	bomberclone.h \
+	chat.h \
+	font.h \
+	gamesrv.h \
+	gfx.h \
+	keybinput.h \
+	map.h \
+	network.h \
+	packets.h \
+	sysfunc.h
+
+EXTRA_DIST = $(bomberclone_include_DATA)

include/basic.h

@@ -1,4 +1,4 @@
-/* $Id: basic.h,v 1.53 2003/09/10 22:21:18 stpohle Exp $ */
+/* $Id: basic.h,v 1.1 2003/09/21 20:15:28 stpohle Exp $ */
 /* basic types which we need everywhere */
 
 #ifndef _BC_BASIC_H_

include/bomberclone.h

@@ -1,4 +1,4 @@
-/* $Id: bomberclone.h,v 1.54 2003/08/29 23:50:39 stpohle Exp $ */
+/* $Id: bomberclone.h,v 1.1 2003/09/21 20:15:28 stpohle Exp $ */
 /* bomberclone.h */
 
 #ifndef _BOMBERCLONE_H_

include/gfx.h

@@ -1,4 +1,4 @@
-/* $Id: gfx.h,v 1.18 2003/07/25 12:28:50 stpohle Exp $ */
+/* $Id: gfx.h,v 1.1 2003/09/21 20:15:28 stpohle Exp $ */
 #ifndef _GFX_H_
 
 #define _GFX_H_

include/map.h

@@ -1,4 +1,4 @@
-/* $Id: map.h,v 1.6 2003/09/10 21:32:22 stpohle Exp $ */
+/* $Id: map.h,v 1.1 2003/09/21 20:15:28 stpohle Exp $ */
 /* map.h */
 
 #ifndef _MAP_H_

include/sound.h

@@ -1,4 +1,4 @@
-/* $Id: sound.h,v 1.3 2003/08/06 19:29:10 stpohle Exp $ */
+/* $Id: sound.h,v 1.1 2003/09/21 20:15:28 stpohle Exp $ */
 /* include file for the sound */
 
 #ifndef _SOUND_H_

include/sysfunc.h

@@ -1,4 +1,4 @@
-/* $Id: sysfunc.h,v 1.8 2003/09/10 21:32:22 stpohle Exp $ */
+/* $Id: sysfunc.h,v 1.1 2003/09/21 20:15:28 stpohle Exp $ */
 /* include some system near functions */
 
 #ifndef _SYSFUNC_H_

src/Makefile.am

@@ -1,48 +1,36 @@
 
-INCLUDES =
+INCLUDES = -I../include
 
 bin_PROGRAMS = bomberclone
 
 bomberclone_SOURCES = \
-	basic.h\
 	main.c\
 	bomb.c\
-	bomberclone.h\
 	debug.c\
 	packets.c\
 	font.c\
-	font.h\
-	gfx.h\
 	gfx.c\
 	gfxengine.c\
 	gfxpixelimage.c\
 	player.c\
-	packets.h\
 	game.c\
 	netmenu.c\
 	network.c\
 	udp.c\
 	menu.c\
 	map.c\
-	map.h\
 	mapmenu.c\
 	tileset.c\
 	field.c\
-	network.h\
-	sysfunc.h\
 	sysfunc.c\
 	configuration.c\
 	pkgcache.c\
-	gamesrv.h\
 	gamesrv.c \
 	chat.c \
 	multiwait.c \
-	chat.h \
-	keybinput.h \
 	keybinput.c \
 	single.c \
 	special.c \
-	sound.h \
 	sound.c
 
 ## bomberclone_LDADD =