Huge code merge. This reflects the current status of my rewrite/restructuring. A...

[supertux.git] / src / setup.h

diff --git a/src/setup.h b/src/setup.h
index e999b2a..db406ad 100644 (file)
--- a/src/setup.h
+++ b/src/setup.h
@@ -10,11 +10,21 @@
   April 11, 2000 - April 13, 2000
 */
 
-void st_directory_setup(void);
-void st_general_setup(void);
-void st_video_setup(void);
-void st_audio_setup(void);
-void st_joystick_setup(void);
-void st_shutdown(void);
-void st_abort(char * reason, char * details);
-void parseargs(int argc, char * argv[]);
+#if !defined( SUPERTUX_SETUP_H )
+#define SUPERTUX_SETUP_H 1
+
+        #include "sound.h"
+
+       int faccessible(char *filename);
+        void st_directory_setup(void);
+        void st_general_setup(void);
+        void st_video_setup_sdl(void);
+        void st_video_setup_gl(void);
+        void st_video_setup(void);
+       void st_audio_setup(void);
+        void st_joystick_setup(void);
+        void st_shutdown(void);
+        void st_abort(char * reason, char * details);
+        void parseargs(int argc, char * argv[]);
+#endif
+