diff options
| author | Sven Gothel <[email protected]> | 2014-06-25 12:39:48 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-06-25 12:39:48 +0200 |
| commit | 008b3512be183cefc82e051b36c7a74d53c4906d (patch) | |
| tree | da1c8d5dd410c5a120d722de47082ff86bfcac6c /make | |
| parent | a515faf5e7d679b7ad87a05fa8fc81ab148bcd41 (diff) | |
Bug 1021: OVR GlueGen Mapping: Compile all generated C files, add missing C ovrHmdStruct in generated files, reduce warnings.
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-oculusvr.xml | 2 | ||||
| -rw-r--r-- | make/config/oculusvr/oculusvr-common.cfg | 5 | ||||
| -rw-r--r-- | make/config/oculusvr/oculusvr.cfg | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml index e0e5c4c12..c9370c547 100644 --- a/make/build-oculusvr.xml +++ b/make/build-oculusvr.xml @@ -370,6 +370,8 @@ <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition> <patternset id="c.src.files.oculusvr.c"> + <include name="${rootrel.generated.c}/ovrDistortionMesh_JNI.c"/> + <include name="${rootrel.generated.c}/ovrHmdDesc_JNI.c"/> <include name="${rootrel.generated.c}/OVR_JNI.c"/> </patternset> <patternset id="c.src.files.oculusvr.cpp"> diff --git a/make/config/oculusvr/oculusvr-common.cfg b/make/config/oculusvr/oculusvr-common.cfg index c1e4d9cfd..eb01cf067 100644 --- a/make/config/oculusvr/oculusvr-common.cfg +++ b/make/config/oculusvr/oculusvr-common.cfg @@ -20,6 +20,11 @@ Opaque boolean ovrBool # Not implemented in SDK !? Ignore ovrHmd_ProcessLatencyTest +# Not native sized: CType['uintptr_t *', size [fixed false, lnx64 64], [array*1]] +Ignore ovrRenderAPIConfig.PlatformData +# Not native sized: CType['uintptr_t *', size [fixed false, lnx64 64], [array*1]] +Ignore ovrTexture.PlatformData + # These routines use or return strings ReturnsString ovrHmd_GetLastError ReturnsString ovrHmd_GetLatencyTestResult diff --git a/make/config/oculusvr/oculusvr.cfg b/make/config/oculusvr/oculusvr.cfg index aa439772b..11e1ee78b 100644 --- a/make/config/oculusvr/oculusvr.cfg +++ b/make/config/oculusvr/oculusvr.cfg @@ -12,5 +12,7 @@ IncludeAs CustomJavaCode OVR oculusvr-ovr-CustomJavaCode.java ManualStaticInitCall OVR # Provide #includes to native code +CustomCCode typedef struct ovrHmdStruct { +CustomCCode } OvrHmdContext; CustomCCode #include <OVR_CAPI.h> |