Changeset 781Tweet

Timestamp:

Apr 17, 2006, 12:41:30 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added preliminary C++ bindings

Location:

libcaca/trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (6 diffs)
• cpp (added)
• cpp/Makefile.am (added)
• cpp/Makefile.in (added)
• cpp/caca++.cpp (added)
• cpp/caca++.h (added)
• cpp/caca++.pc (added)
• cpp/caca++.pc.in (added)
• cpp/cpptest.cpp (added)
• cpp/cucul++.cpp (added)
• cpp/cucul++.h (added)
• cpp/cucul++.pc (added)
• cpp/cucul++.pc.in (added)

libcaca/trunk/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-SUBDIRS = kernel cucul caca src test tools doc
+SUBDIRS = kernel cucul caca src test tools cpp doc
 DIST_SUBDIRS = $(SUBDIRS) autotools debian msvc
 

libcaca/trunk/configure.ac

@@ -12 +12 @@
 AM_PROG_CC_C_O
 AC_PROG_CPP
+AC_PROG_CXX
 AM_PROG_AS
 
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
+AC_LIBTOOL_CXX
+
 
 AC_C_CONST
@@ -24 +27 @@
 dnl now otherwise it might be set in an obscure if statement. Same thing for
 dnl PKG_PROG_PKG_CONFIG which needs to be called first.
-AC_EGREP_CPP(foo, foo)
+AC_EGREP_CPP(yes, foo)
 PKG_PROG_PKG_CONFIG()
+
+dnl Check the C++ compiler and preprocessor.
+AC_PROG_CXX
+AC_PROG_CXXCPP
+
+dnl Set the test language as C++
+AC_LANG([C++])
+
 
 dnl output driver features
@@ -45 +56 @@
   [  --enable-vga            VGA support (default disabled)])
 
+AC_ARG_ENABLE(cpp,
+  [  --enable-cpp            C++ bindings (autodetected)])
+
 dnl example programs features
 AC_ARG_ENABLE(imlib2,
@@ -76 +90 @@
 
 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
+
+
+if test "${enable_cpp}" != "no"; then
+  ac_cv_my_have_cpp="yes"
+  AC_DEFINE(USE_CPP, 1,
+                Define to 1 to enable C++ bindigs)
+fi
 
 CACA_DRIVERS="" 
@@ -222 +243 @@
 fi
 
+
+
+
+
 AC_SUBST(MATH_LIBS)
 AC_SUBST(CACA_LIBS)
 AC_SUBST(CUCUL_LIBS)
+AC_SUBST(CUCUL++_LIBS)
 
 # Optimizations
@@ -302 +328 @@
   test/Makefile
   tools/Makefile
+  cpp/Makefile
   doc/Makefile
   autotools/Makefile