Changeset 19902

Timestamp:

04/05/07 17:15:09 (2 years ago)

Author:

patrick

Message:

Hook up the Cocoa bits to the build. While all of the kinks are not yet
worked out, I have been running this code for two months now, and I think
it is ready for other people to try.

Bumped version to 2.1.21.

Files:

• juggler/trunk/modules/vrjuggler/ChangeLog (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/VERSION (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/common.defs.mk.in (modified) (3 diffs)
• juggler/trunk/modules/vrjuggler/configure.ac (modified) (7 diffs)
• juggler/trunk/modules/vrjuggler/vrj.appdefs.mk.in (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/Makefile.in (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/vrj/Kernel/Makefile.in (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/vrjuggler.fpc.in (modified) (1 diff)

juggler/trunk/modules/vrjuggler/ChangeLog

@@ -1 +1 @@
-DATE        AUTHOR      CHANGE
------------ ----------- -------------------------------------------------------
+Apr-05-2007 patrick     Added support for Cocoa windows on Mac OS X.
+                        NEW VERSION: 2.1.21
-Mar-21-2007 patrick     Instances of vrj::DrawSimInterfaces are now handled
-                        internally using boost::shared_ptr<T>.

juggler/trunk/modules/vrjuggler/VERSION

@@ +1 @@
+2.1.21-0 @04/05/2007 22:20:00 UTC@
-2.1.20-0 @03/21/2007 13:05:00 UTC@
-2.1.19-0 @03/18/2007 15:25:00 UTC@

juggler/trunk/modules/vrjuggler/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/vrjuggler/configure.ac

@@ -151 +151 @@
-# Checks for libraries.
-# -----------------------------------------------------------------------------
-35
+44
-
-JCCL_PATH_CXX([1.1.5], ,
-              [AC_MSG_ERROR(*** JCCL C++ API required for VR Juggler ***)])
-4
+5
-               [AC_MSG_ERROR(*** Gadgeteer required for VR Juggler ***)])
-SNX_PATH([1.1.4], , [AC_MSG_ERROR(*** Sonix required for VR Juggler ***)])
@@ -177 +177 @@
-
-   AC_DEFINE([VRJ_USE_X11], , [Define if the X Window System will be used.])
+# 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.
+elif test "x$PLATFORM" = "xDarwin" ; then
+   DPP_PROG_OBJC
+   DPP_PROG_OBJCXX
+   AC_DEFINE([VRJ_USE_COCOA], , [Define if Cocoa will be used.])
-fi
-
@@ -315 +321 @@
-
-CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $GADGET_CXXFLAGS $SNX_CXXFLAGS"
+OBJCXXFLAGS="$CXXFLAGS -fobjc-exceptions"
-BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS"
-DEPEND_FLAGS="$GADGET_CXXFLAGS $SNX_CXXFLAGS"
@@ -346 +353 @@
-      CFLAGS_DYNLIB="$CFLAGS_DYNLIB -fexport-coalesced"
-      CXXFLAGS_DYNLIB="$CXXFLAGS_DYNLIB -fexport-coalesced"
+      OBJCXXFLAGS_DYNLIB="$OBJCXXFLAGS_DYNLIB -fexport-coalesced"
-   fi
-
@@ -385 +393 @@
-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])
@@ -435 +444 @@
-    DYLIB_DEPS_PF="$PF_LDFLAGS $LIBPERFORMER $REQ_EXTRA_LIBS"
-
-
+
+
-
-    if test "x$VRJ_USE_X11" != "xyes" ; then
-
+
+
-    fi
-
@@ -447 +458 @@
-
-    if test "x$PLATFORM" = "xDarwin" ; then
+        DYLIB_DEPS_VJ="$DYLIB_DEPS_VJ $osx_core_frameworks"
+
-        if test "x$VRJ_USE_X11" = "xyes" ; then
-            CFLAGS="$CFLAGS $X_CFLAGS"
-            CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-
-
+gl_
+gl_
-        else
-
-
+gl_
+gl_
-        fi
-    else

juggler/trunk/modules/vrjuggler/vrj.appdefs.mk.in

@@ -77 +77 @@
-                        $(NULL)
-
+APP_ICNS=               $(shell $(FLAGPOLL) vrjuggler --exact-version=$(VRJ_VERSION) --get-vrj-app-icons)
+APP_RESOURCES=          $(APP_ICNS)
+APP_INFO_PLIST=         $(shell $(FLAGPOLL) vrjuggler --exact-version=$(VRJ_VERSION) --get-vrj-app-info-plist)
+APP_NIBS=               $(shell $(FLAGPOLL) vrjuggler --exact-version=$(VRJ_VERSION) --get-vrj-app-nib)
+APP_INFO_STRINGS=       $(shell $(FLAGPOLL) vrjuggler --exact-version=$(VRJ_VERSION) --get-vrj-app-info-strings)
+
-include $(DZR_BASE_DIR)/mk/dzr.basicapp.mk
-

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/Makefile.in

@@ -62 +62 @@
-                GlxExtensionLoader.cpp
-      else
-
+
+
-      endif
-   else

juggler/trunk/modules/vrjuggler/vrj/Kernel/Makefile.in

@@ -48 +48 @@
-                User.cpp
-
+ifeq (@PLATFORM@, Darwin)
+   ifeq (@GADGET_USE_COCOA@, yes)
+      SRCS+=    CocoaWrapper.mm
+   endif
+endif
+
-include $(MKPATH)/dpp.obj.mk
-

juggler/trunk/modules/vrjuggler/vrjuggler.fpc.in

@@ -82 +82 @@
-# Build bits
-vrj_app_defs_file: ${vrj_share_dir}/vrj.appdefs.mk
+vrj_app_info_plist: ${vrj_share_dir}/data/bundle/Info.plist
+vrj_app_nib: ${vrj_share_dir}/data/bundle/MainMenu.nib
+vrj_app_info_strings: ${vrj_share_dir}/data/bundle/InfoPlist.strings
+vrj_app_icons: ${vrj_share_dir}/data/bundle/vrjuggler.icns