Changeset 19854

Timestamp:

03/03/07 23:17:49 (2 years ago)

Author:

patrick

Message:

Hook the Cocoa input window code up to the build. This adds support for
compiling Objective-C and Objective-C++ code. The use of the X Window System
will remain the default on Mac OS X until the OpenGL window code in VR Juggler
is ready to go.

Bumped version to 1.1.25.

Files:

• juggler/trunk/modules/gadgeteer/common.defs.mk.in (modified) (3 diffs)
• juggler/trunk/modules/gadgeteer/configure.ac (modified) (10 diffs)
• juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/Makefile.in (modified) (1 diff)
• juggler/trunk/modules/gadgeteer/gadget/Type/DeviceFactory.cpp (modified) (2 diffs)
• juggler/trunk/modules/gadgeteer/gadgeteer.fpc.in (modified) (2 diffs)

juggler/trunk/modules/gadgeteer/common.defs.mk.in

@@ -139 +139 @@
-# C_COMPILE       - Command for compiling C code.
-# CXX_COMPILE     - Command for compiling C++ code.
+# OBJC_COMPILE    - Command for compiling Objective-C code.
+# OBJCXX_COMPILE  - Command for compiling Objective-C++ code.
-#
-# ABI             - Application Binary Interface type.  This may be used for
@@ -214 +216 @@
-MAKEDEPEND=             @MAKEDEPEND@
-MKPATH?=                
+OBJC=                   @OBJC@
+OBJCFLAGS=              @OBJCFLAGS@ $(OPTIMIZER) $(EXTRA_OBJCFLAGS)
+OBJCXX=                 @OBJCXX@
+OBJCXXFLAGS=            @OBJCXXFLAGS@ $(OPTIMIZER) $(EXTRA_OBJCXXFLAGS)
-OBJEXT=                 @OBJEXT@
-OBJ_BUILD_FLAG=         @OBJ_BUILD_FLAG@
@@ -268 +274 @@
-CXX_COMPILE=            $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS)          \
-                        $(CXXFLAGS) $(CXX_WARN_FLAGS)
+OBJC_COMPILE=           $(OBJC) $(DEFS) $(INCLUDES) $(CPPFLAGS)         \
+                        $(OBJCFLAGS) $(OBJC_WARN_FLAGS)
+OBJCXX_COMPILE=         $(OBJCXX) $(DEFS) $(INCLUDES) $(CPPFLAGS)       \
+                        $(OBJCXXFLAGS) $(OBJCXX_WARN_FLAGS)
-
-# -----------------------------------------------------------------------------

juggler/trunk/modules/gadgeteer/configure.ac

@@ -56 +56 @@
-AC_ARG_ENABLE([xwindows],
-              [  --enable-xwindows       Use X11 for windowing code ],
-no
+yes
-
-DPP_STD_CPP(yes)
@@ -89 +89 @@
-# such.
-case $target_os in
-   # Darwin, aka Mac OS X.
-   darwin*)
-      if test "x$XWIN_UI" != "xyes" ; then
-         AC_MSG_WARN([WARNING: Forcing the use of the X Window System. The Carbon support is currently unusable.])
-         XWIN_UI='yes'
-      fi
-      ;;
-   # SGI running IRIX 6.*.
-   irix6*)
@@ -136 +129 @@
-# -----------------------------------------------------------------------------
-VJ_COMPILER_SETUP
+
+# If we are not using X11 on Mac OS X, then we need to make sure that we can
+# build Objective-C and Objective-C++ code.
+if test "x$PLATFORM" = "xDarwin" -a "x$XWIN_UI" != "xyes" ; then
+   DPP_PROG_OBJC
+   DPP_PROG_OBJCXX
+fi
+
-VJ_PROG_CC_PROF_FLAG(yes)
-VJ_PROG_CXX_PROF_FLAG(yes)
@@ -175 +176 @@
-
-gadget_use_x11='no'
+gadget_use_cocoa='no'
-
-if test "x$have_x" = "xyes" ; then
@@ -182 +184 @@
-      if test "x$XWIN_UI" = "xyes" ; then
-         gadget_use_x11='yes'
-
+
+
+
+
-      fi
-   elif test "x$OS_TYPE" = "xUNIX" ; then
-      gadget_use_x11='yes'
-GADGET_USE_X11
+[GADGET_USE_X11]
-   fi
-# If --enable-xwindows was passed on the command line but X11 was not found,
@@ -250 +255 @@
-
-CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES"
+OBJCXXFLAGS="$CXXFLAGS -fobjc-exceptions"
-BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS"
-DEPEND_FLAGS="$VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES"
@@ -266 +272 @@
-    if test $vpr_gcc_major -lt 4 ; then
-       CXXFLAGS_DYNLIB="$CXXFLAGS_DYNLIB -fexport-coalesced"
+       OBJCXXFLAGS_DYNLIB="$OBJCXXFLAGS_DYNLIB -fexport-coalesced"
-    fi
-
@@ -306 +313 @@
-       APP_EXTRA_PROF_LIBS="$APP_EXTRA_PROF_LIBS $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-    elif test "x$PLATFORM" = "xDarwin" ; then
-arbon
-arbon
+ocoa
+ocoa
-    fi
-fi
@@ -328 +335 @@
-VJ_STRIP_DUPLICATE_ARGS(CFLAGS, [$CFLAGS])
-VJ_STRIP_DUPLICATE_ARGS(CXXFLAGS, [$CXXFLAGS])
+VJ_STRIP_DUPLICATE_ARGS(OBJCXXFLAGS, [$OBJCXXFLAGS])
-VJ_STRIP_DUPLICATE_ARGS(DEPEND_FLAGS, [$DEPEND_FLAGS])
-VJ_STRIP_DUPLICATE_ARGS(DEPEND_EXTRAS, [$DEPEND_EXTRAS])
@@ -467 +475 @@
-AC_SUBST(gadget64_flags)
-AC_SUBST(gadget_use_x11)
+AC_SUBST(gadget_use_cocoa)
-
-# -----------------------------------------------------------------------------

juggler/trunk/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/Makefile.in

@@ -57 +57 @@
-         SRCS+= $(xwin_srcs)
-      else
-
-
+
+
+
-      endif
-   else

juggler/trunk/modules/gadgeteer/gadget/Type/DeviceFactory.cpp

@@ -49 +49 @@
-#  include <gadget/Devices/KeyboardMouseDevice/InputWindowWin32.h>
-#elif defined(VPR_OS_Darwin) && ! defined(GADGET_USE_X11)
-OSX
+Cocoa
-#else
-//#  include <jccl/RTRC/DependencyManager.h>
@@ -132 +132 @@
-   }
-#elif defined(VPR_OS_Darwin) && ! defined(GADGET_USE_X11)
-OSX
-OSX
+Cocoa
+Cocoa
-   if( (NULL == osx_keyboard) )
-   {

juggler/trunk/modules/gadgeteer/gadgeteer.fpc.in

@@ -43 +43 @@
-
-gadget_use_x11= @gadget_use_x11@
+gadget_use_cocoa= @gadget_use_cocoa@
-
-########################### Public Variables ############################
@@ -61 +62 @@
-######################### Gadget Specific Flagpoll Variables ###################
-use_x11 : ${gadget_use_x11}
+use_cocoa : ${gadget_use_cocoa}
-libs: ${gadget_libs}
-extra_libs : ${extra_libs}