Changeset 5487

Timestamp:

Jul 11, 2008, 12:45:58 PM (15 years ago)

Author:

jack

Message:

Started C++-ising the code.

Location:

anuga_work/development/anugavis

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (2 diffs)
• src/anugavis.cc (added)
• src/anugavis.hh (added)
• src/anugavis_simple_cxx.cc (added)
• src/netcdf_file.cc (added)
• src/netcdf_file.hh (added)
• src/output.cc (added)
• src/output.hh (added)

anuga_work/development/anugavis/configure.ac

@@ -10 +10 @@
 # Checks for programs.
 AC_PROG_CC
-AM_PROG_CC_C_O
+AC_PROG_CXX
 AC_PROG_RANLIB
 
@@ -24 +24 @@
 AC_CHECK_HEADER([netcdf.h], [],
                 [AC_MSG_ERROR([Can't find the NetCDF header. (CPPFLAGS?)])])
+AC_CHECK_HEADER([windows.h])
+AX_BOOST_BASE([1.35.0])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
+AC_C_INLINE
 AC_TYPE_SIZE_T
+AM_PROG_CC_C_O
 
 # Checks for library functions.

anuga_work/development/anugavis/src/Makefile.am

@@ -1 +1 @@
 ## Process this file with automake to generate Makefile.in
+AM_CFLAGS = $(SDL_CFLAGS) $(GLU_CFLAGS)
+AM_CXXFLAGS = $(SDL_CFLAGS) $(GLU_CFLAGS)
 
 # Convenience library for the core visualiser code.
-noinst_LIBRARIES = libanugavis.a
+noinst_LIBRARIES = libanugavis.a libanugavis_cxx.a
 libanugavis_a_SOURCES = camera.c \
                         camera.h \
@@ -20 +22 @@
                         xfunctions.c \
                         xfunctions.h
-libanugavis_a_CFLAGS = @SDL_CFLAGS@ @GLU_CFLAGS@
-libanugavis_a_LIBADD = @LIBOBJS@
+libanugavis_a_LIBADD = $(LIBOBJS)
+libanugavis_cxx_a_SOURCES = anugavis.cc \
+                            anugavis.hh \
+                            netcdf_file.cc \
+                            netcdf_file.hh \
+                            output.cc \
+                            output.hh
+libanugavis_cxx_a_LIBADD = $(LIBOBJS)
 
 bin_PROGRAMS = anugavis_simple
-anugavis_simple_SOURCES = anugavis_simple.c
-anugavis_simple_CFLAGS = @SDL_CFLAGS@ @GLU_CFLAGS@
-anugavis_simple_LDADD = libanugavis.a @SDL_LIBS@ @GLU_LIBS@
+anugavis_simple_SOURCES = anugavis_simple_cxx.cc
+anugavis_simple_LDADD = libanugavis_cxx.a $(SDL_LIBS) $(GLU_LIBS)