Changeset 5215

Timestamp:

Apr 17, 2008, 1:16:56 PM (17 years ago)

Author:

jack

Message:

Removed ax_check_glut.m4 as we use SDL and not GLUT.
Added basic initialisation funcs.

Location:

anuga_work/development/anugavis

Files:

• configure.ac (modified) (1 diff)
• m4/ax_check_glut.m4 (deleted)
• src/Makefile.am (modified) (1 diff)
• src/anugavis.h (modified) (1 diff)
• src/error.c (added)
• src/init.c (moved) (moved from anuga_work/development/anugavis/src/anugavis.c) (1 diff)

anuga_work/development/anugavis/configure.ac

@@ -10 +10 @@
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_RANLIB
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
 
 # Checks for libraries.
-AX_CHECK_GLUT
+AX_CHECK_GL
+AC_SEARCH_LIBS([SDL_Init], [SDL], [],
+               [AC_MSG_ERROR([Can't link against the SDL library. (LDFLAGS?)])])
 
 # Checks for header files.
+AC_CHECK_HEADER([SDL.h], [],
+                [AC_MSG_ERROR([Can't find the SDL header. (Check CPPFLAGS?)])])
 
 # Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
 
 # Checks for library functions.

anuga_work/development/anugavis/src/Makefile.am

@@ +1 @@
+include_HEADERS = anugavis.h
+
+lib_LTLIBRARIES = libanugavis.la
+libanugavis_la_SOURCES = anugavis.h error.c init.c
+libanugavis_la_LDFLAGS = -no-undefined -version-info 1:0:0

anuga_work/development/anugavis/src/anugavis.h

@@ -2 +2 @@
 #define ANUGAVIS_H
 
+extern int AnugaVis_Init(void);
+extern void AnugaVis_DeInit(void);
+
+extern char* AnugaVis_GetError(void);
+extern void AnugaVis_SetError(const char *format, ...);
+
 #endif

anuga_work/development/anugavis/src/init.c

@@ -3 +3 @@
 
 int AnugaVis_Init(void){
-  if(SDL_Init(SDL_INIT_VIDEO) == -1) return -1;
+  if(SDL_Init(SDL_INIT_VIDEO) == -1){
+    AnugaVis_SetError("SDL Error: %s", SDL_GetError());
+    SDL_ClearError();
+    return -1;
+  }
 }