diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 2 | ||||
| -rw-r--r-- | make/build-oculusvr.xml | 183 | ||||
| -rw-r--r-- | make/config/oculusvr/oculusvr-common.cfg | 12 | ||||
| -rw-r--r-- | make/config/oculusvr/oculusvr.c | 3 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.macosx-java6.sh | 5 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.macosx.sh | 1 | ||||
| -rwxr-xr-x | make/scripts/tests-win.bat | 4 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 3 |
8 files changed, 137 insertions, 76 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 5be5fedc7..1d408a057 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -239,7 +239,7 @@ <property name="rootrel.oculusvr.sdk" value="oculusvr-sdk"/> <property name="rel.oculusvr.sdk" value="${project.root}/${rootrel.oculusvr.sdk}"/> <condition property="oculusvr.sdk.available"> - <available file="${rel.oculusvr.sdk}/LibOVR/Src/OVR_CAPI.h"/> + <available file="${rel.oculusvr.sdk}/LibOVR/Include/OVR_CAPI.h"/> </condition> <property name="results.test" value="${build}/test/results" /> diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml index 1d280d882..b89b66fb7 100644 --- a/make/build-oculusvr.xml +++ b/make/build-oculusvr.xml @@ -62,19 +62,29 @@ <property name="classes" value="${build.oculusvr}/classes" /> <!-- The OculusVR headers from which Java files are generated --> + <property name="stub.includes.kern" value="${rel.oculusvr.sdk}/LibOVRKernel/Src" /> + <property name="stub.includes.inc" value="${rel.oculusvr.sdk}/LibOVR/Include" /> <property name="stub.includes.ovr" value="${rel.oculusvr.sdk}/LibOVR/Src" /> - <property name="stub.includes.all.ovr" value="${stub.includes.ovr},${stub.includes.ovr}/CAPI" /> + <property name="stub.includes.all.ovr" value="${stub.includes.kern},${stub.includes.inc},${stub.includes.ovr},${stub.includes.ovr}/CAPI" /> <echo message="rel.oculusvr.sdk ${rel.oculusvr.sdk}" /> + <echo message="stub.includes.kern ${stub.includes.kern}" /> + <echo message="stub.includes.inc ${stub.includes.inc}" /> <echo message="stub.includes.ovr ${stub.includes.ovr}" /> <echo message="stub.includes.all.ovr ${stub.includes.all.ovr}"/> - <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes.ovr}"> + <fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes.kern}"> + <include name="**" /> + </fileset> + <fileset id="stub.includes.dependencies.fileset.2" dir="${stub.includes.inc}"> + <include name="**" /> + </fileset> + <fileset id="stub.includes.dependencies.fileset.3" dir="${stub.includes.ovr}"> <include name="**" /> </fileset> <!-- echo message="stub.includes.dependencies.fileset.1 ${toString:stub.includes.dependencies.fileset.1}"/ --> - <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" /> - <fileset id="stub.includes.dependencies.fileset.3" dir="${config.oculusvr}"> + <fileset id="stub.includes.dependencies.fileset.4" file="${gluegen.jar}" /> + <fileset id="stub.includes.dependencies.fileset.5" dir="${config.oculusvr}"> <include name="*.cfg" /> <include name="*.java" /> <include name="*.c" /> @@ -125,6 +135,8 @@ <srcfileset refid="stub.includes.dependencies.fileset.1" /> <srcfileset refid="stub.includes.dependencies.fileset.2" /> <srcfileset refid="stub.includes.dependencies.fileset.3" /> + <srcfileset refid="stub.includes.dependencies.fileset.4" /> + <srcfileset refid="stub.includes.dependencies.fileset.5" /> <targetfileset dir="${src.generated}"> <include name="**/*.java" /> <include name="**/*.c" /> @@ -138,6 +150,8 @@ <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> + <srcfiles refid="stub.includes.dependencies.fileset.4" /> + <srcfiles refid="stub.includes.dependencies.fileset.5" /> </uptodate> <condition property="java.generate.skip"> @@ -417,67 +431,67 @@ <include name="${rootrel.generated.c}/OVR_JNI.c"/> </patternset> <patternset id="c.src.files.oculusvr.cpp"> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/OVR_CAPI.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_DistortionRenderer.cpp"/> - <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/GL/CAPI_GL_DistortionRenderer.cpp"/--> - <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/GL/CAPI_GL_HSWDisplay.cpp"/--> - <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/GL/CAPI_GL_Util.cpp"/--> - <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/GL/CAPI_GLE.cpp"/--> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_FrameTimeManager.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_HMDRenderState.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_HMDState.cpp"/> - <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_HSWDisplay.cpp"/ --> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_LatencyStatistics.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_Alg.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_Allocator.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_Atomic.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_Callbacks.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_CRC32.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_DebugHelp.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_File.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_FileFILE.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_JSON.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_Lockless.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_Log.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_Rand.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_RefCount.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_SharedMemory.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_Std.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_String.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_String_FormatUtil.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_String_PathUtil.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_SysFile.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_System.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_ThreadCommandQueue.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_ThreadsPthread.cpp" if="isLinux"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_ThreadsPthread.cpp" if="isOSX"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp" if="isWindows"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_Timer.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Kernel/OVR_UTF8Util.cpp"/> + + <!-- include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Util/Util_Direct3D.cpp" if="isWindows"/ --> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Util/Util_GetSystemSpecs.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Util/Util_ImageWindow.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Util/Util_LongPollThread.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Util/Util_SystemGUI.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Util/Util_SystemInfo.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Util/Util_Watchdog.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Util/Util_SystemGUI_OSX.mm" if="isOSX"/> + <include name="${rootrel.oculusvr.sdk}/LibOVRKernel/Src/Util/Util_SystemInfo_OSX.mm" if="isOSX"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/OVR_JSON.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/OVR_CAPI.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/OVR_CAPI_Util.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/OVR_Linux_UDEV.cpp" if="isLinux"/> <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/OVR_Profile.cpp"/> <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/OVR_SerialFormat.cpp"/> <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/OVR_Stereo.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/OVR_StereoProjection.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_Alg.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_Allocator.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_Atomic.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_CRC32.cpp"/> - <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_DebugHelp.cpp"/ --> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_File.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_FileFILE.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_Lockless.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_Log.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_Math.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_RefCount.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_SharedMemory.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_Std.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_String.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_String_FormatUtil.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_String_PathUtil.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_SysFile.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_System.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_ThreadCommandQueue.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_ThreadsPthread.cpp" if="isLinux"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_ThreadsPthread.cpp" if="isOSX"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_ThreadsWinAPI.cpp" if="isWindows"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_Timer.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Kernel/OVR_UTF8Util.cpp"/> - - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_ImageWindow.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_Interface.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_LatencyTest2Reader.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_Render_Stereo.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_SystemGUI.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_SystemGUI_OSX.mm" if="isOSX"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_SystemInfo.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_SystemInfo_OSX.mm" if="isOSX"/> + <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_DistortionRenderer.cpp"/ --> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_DistortionTiming.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_FrameLatencyTracker.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_FrameTimeManager3.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_HMDRenderState.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_HMDState.cpp"/> + <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/CAPI/CAPI_HSWDisplay.cpp"/ --> <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Display.cpp"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Linux_Display.cpp" if="isLinux"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Linux_SDKWindow.cpp" if="isLinux"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_OSX_Display.cpp" if="isOSX"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Win32_Display.cpp" if="isWindows"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Win32_FocusReader.cpp" if="isWindows"/> + <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Linux_Display.cpp" if="isLinux"/ --> + <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Linux_SDKWindow.cpp" if="isLinux"/ --> + <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_OSX_Display.cpp" if="isOSX"/ --> + <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Win32_Display.cpp" if="isWindows"/ --> + <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Win32_FocusReader.cpp" if="isWindows"/ --> <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Win32_RenderShim.cpp" if="isWindows"/ --> <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_Win32_ShimFunctions.cpp" if="isWindows"/ --> - <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_OSX_FocusObserver.mm" if="isOSX"/ --> - <!-- include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Displays/OVR_OSX_FocusReader.mm" if="isOSX"/ --> <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Net/OVR_BitStream.cpp"/> <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Net/OVR_NetworkPlugin.cpp"/> @@ -488,14 +502,20 @@ <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Net/OVR_Unix_Socket.cpp" if="isLinux"/> <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Net/OVR_Unix_Socket.cpp" if="isOSX"/> <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Net/OVR_Win32_Socket.cpp" if="isWindows"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Service/Service_NetClient.cpp"/> <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Service/Service_NetSessionCommon.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp" if="isWindows"/> - <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Tracking/Tracking_SensorStateReader.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_Interface.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_LatencyTest2Reader.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_MatFile.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Util/Util_Render_Stereo.cpp"/> - <include name="${rootrel.oculusvr.sdk}/3rdParty/TinyXml/tinyxml2.cpp"/> + <include name="${rootrel.oculusvr.sdk}/LibOVR/Src/Vision/SensorFusion/Vision_SensorStateReader.cpp"/> - <include name="${rootrel.oculusvr.sdk}/3rdParty/EDID/edid.cpp" if="isLinux"/> + <!-- include name="${rootrel.oculusvr.sdk}/3rdParty/TinyXml/tinyxml2.cpp"/ --> + <!-- include name="${rootrel.oculusvr.sdk}/3rdParty/EDID/edid.cpp" if="isLinux"/ --> </patternset> <echo message="Compiling @{output.lib.name}" /> @@ -530,6 +550,8 @@ <sysincludepath path="${java.includes.dir}"/> <sysincludepath path="${java.includes.dir.platform}"/> <sysincludepath path="${stub.includes.gluegen.cc}"/> + <includepath path="${stub.includes.kern}"/> + <includepath path="${stub.includes.inc}"/> <includepath path="${stub.includes.ovr}"/> <includepath path="${stub.includes.ovr}/CAPI"/> @@ -537,8 +559,12 @@ <includepath path="${src.c}"/> <includepath path="${src.generated.c}" /> - <compilerarg location="start" value="-ObjC" if="isOSX"/> + <compilerarg location="start" value="-ObjC" if="isOSX"/> + <compilerarg location="start" value="-mmacosx-version-min=10.7" if="isOSX"/> + <compilerarg value="-municode" if="isMingW"/> + <compilerarg value="-DUNICODE" if="isMingW"/> + <compilerarg value="-D_UNICODE" if="isMingW"/> </compiler> </cc> <!-- C++ Compilation --> @@ -558,6 +584,8 @@ <sysincludepath path="${java.includes.dir}"/> <sysincludepath path="${java.includes.dir.platform}"/> <sysincludepath path="${stub.includes.gluegen.cc}"/> + <includepath path="${stub.includes.kern}"/> + <includepath path="${stub.includes.inc}"/> <includepath path="${stub.includes.ovr}"/> <includepath path="${stub.includes.ovr}/CAPI"/> @@ -565,16 +593,28 @@ <includepath path="${src.c}"/> <includepath path="${src.generated.c}" /> - <compilerarg location="start" value="-ObjC++" if="isOSX"/> - <compilerarg location="start" value="-x" if="isCLANG" unless="isOSX"/> - <compilerarg location="start" value="c++" if="isCLANG" unless="isOSX"/> - + <compilerarg location="start" value="-ObjC++" if="isOSX"/> + <compilerarg location="start" value="-x" if="isCLANG" unless="isOSX"/> + <compilerarg location="start" value="c++" if="isCLANG" unless="isOSX"/> + <!-- + <compilerarg location="start" value="-x" if="isCLANG"/> + <compilerarg location="start" value="c++" if="isCLANG"/> + --> + <compilerarg location="start" value="-stdlib=libc++" if="isOSX"/> + <compilerarg location="start" value="-mmacosx-version-min=10.7" if="isOSX"/> + + <compilerarg value="-std=c++11"/> <compilerarg value="-fno-rtti"/> + <compilerarg value="-fno-strict-aliasing"/> + <compilerarg value="-msse2"/> <!-- oops FIXME --> + <compilerarg value="-DHEADLESS_APP=1"/> + <!-- compilerarg value="-DOVR_PRIVATE_FILE=''"/ --> + <compilerarg value="-DOVR_STATIC_BUILD"/> - <compilerarg value="-municode" if="isMingW"/> - <compilerarg value="-DUNICODE" if="isMingW"/> - <compilerarg value="-D_UNICODE" if="isMingW"/> + <compilerarg value="-municode" if="isMingW"/> + <compilerarg value="-DUNICODE" if="isMingW"/> + <compilerarg value="-D_UNICODE" if="isMingW"/> </compiler> </cc> <!-- Linkage --> @@ -606,12 +646,15 @@ <syslibset dir="/usr/lib/amd64" libs="X11 Xrandr udev m" if="isSolarisAMD64"/> <syslibset dir="/usr/lib/sparcv9" libs="X11 Xrandr udev m" if="isSolarisSparcv9"/> + <linkerarg location="start" value="-mmacosx-version-min=10.7" if="isOSX"/> + <!-- syslibset libs="stdc++" Don't link dynamic Static link directive must be at the end! --> - <linkerarg location="end" value="-Wl,-Bstatic" if="isGCC"/> - <linkerarg location="end" value="-lstdc++" /> - <linkerarg location="end" value="-Wl,-Bdynamic" if="isGCC"/> + <linkerarg location="end" value="-Wl,-Bstatic" if="isGCC" unless="isOSX"/> + <linkerarg location="end" value="-lstdc++" unless="isOSX"/> + <linkerarg location="end" value="-Wl,-Bdynamic" if="isGCC" unless="isOSX"/> + <linkerarg location="end" value="-lc++" if="isOSX"/> </linker> </cc> diff --git a/make/config/oculusvr/oculusvr-common.cfg b/make/config/oculusvr/oculusvr-common.cfg index 86d0ce745..cf8419d70 100644 --- a/make/config/oculusvr/oculusvr-common.cfg +++ b/make/config/oculusvr/oculusvr-common.cfg @@ -22,13 +22,23 @@ Ignore ovrRenderAPIConfig.PlatformData # Not native sized: CType['uintptr_t *', size [fixed false, lnx64 64], [array*1]] Ignore ovrTexture.PlatformData +# FIXME: Add wrapper for native/java callbacks +Ignore ovrLogCallback +Ignore ovrInitParams.LogCallback + # We use the SDK in headless mode: # #define HEADLESS_APP 1 # implying: ovrHmdCap_ExtendDesktop # +# SDK rendering disabled Ignore ovr_InitializeRenderingShim -Ignore ovrHmd_RegisterPostDistortionCallback +Ignore ovr_InitializeRenderingShimVersion +Ignore ovrHmd_ConfigureRendering Ignore ovrHmd_AttachToWindow +Ignore ovrHmd_BeginFrame +Ignore ovrHmd_EndFrame +# misc +Ignore ovrHmd_RegisterPostDistortionCallback # HSW = Health and Safety Warning Ignore ovrHSWDisplayState Ignore ovrHmd_GetHSWDisplayState diff --git a/make/config/oculusvr/oculusvr.c b/make/config/oculusvr/oculusvr.c index 35f86eb78..a3a9a3512 100644 --- a/make/config/oculusvr/oculusvr.c +++ b/make/config/oculusvr/oculusvr.c @@ -6,4 +6,7 @@ typedef struct ovrHmdStruct { #define OVR_ALIGNAS(n) +/** Removed in 0.5.0, but permanently enabled! */ +#define ovrDistortionCap_Chromatic 0x01 + #include "OVR_CAPI.h" diff --git a/make/scripts/make.jogl.all.macosx-java6.sh b/make/scripts/make.jogl.all.macosx-java6.sh index 2dfcb372e..4dd4a2619 100755 --- a/make/scripts/make.jogl.all.macosx-java6.sh +++ b/make/scripts/make.jogl.all.macosx-java6.sh @@ -25,6 +25,7 @@ export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" +# BUILD_ARCHIVE=true \ ant \ - -Drootrel.build=build-macosx \ - $* 2>&1 | tee make.jogl.all.macosx.log + -Drootrel.build=build-macosx-java6 \ + $* 2>&1 | tee make.jogl.all.macosx-java6.log diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index dd5415b78..aa85b9213 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -25,6 +25,7 @@ export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" +# BUILD_ARCHIVE=true \ ant \ -Drootrel.build=build-macosx \ $* 2>&1 | tee make.jogl.all.macosx.log diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index 0f73de53d..671ba600d 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -93,6 +93,8 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestBug669RecursiveGLContext01NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestBug669RecursiveGLContext02NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestBug692GL3VAO %* +scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestBug1146GLContextDialogToolTipAWT %* + REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.ect.TestExclusiveContext01VSyncAnimNEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.ect.TestExclusiveContext01VSyncAnimAWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.ect.TestExclusiveContext02FPSAnimNEWT %* @@ -221,4 +223,4 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewt REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.awt.TestBug461FBOSupersamplingSwingAWT REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 -scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 %* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index eeec83ec1..da5e0f3ad 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -409,7 +409,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile02NEWTNoARBCtx $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile03NEWTOffscreen $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile04NEWTOffscreenNoARBCtx $* -testawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $* +#testawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $* # # Stereo @@ -593,6 +593,7 @@ testawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestNEWTCloseX11DisplayBug565 $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestAWTCloseX11DisplayBug565 $* +testawt com.jogamp.opengl.test.junit.jogl.acore.TestBug1146GLContextDialogToolTipAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.anim.TestAnimatorGLWindow01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.anim.TestAnimatorGLJPanel01AWT $* |