Avoid camera

thomasuster · Sep 28, 2023 · 6dbc5ff · 6dbc5ff
1 parent 34c6673
commit 6dbc5ff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/project/Build.xml b/project/Build.xml
@@ -441,7 +441,7 @@
             <vflag name="-framework" value="OpenGL" />
             <vflag name="-framework" value="AppKit" />
             <vflag name="-framework" value="OpenAL"/>
-            <vflag name="-framework" value="AVFoundation" if="NME_CAMERA"/>
+            <vflag name="-framework" value="AVFoundation" />
             <vflag name="-framework" value="CoreMedia" if="NME_CAMERA"/>
             <vflag name="-framework" value="CoreVideo" if="NME_CAMERA"/>
          </section>

diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml
@@ -99,7 +99,8 @@
 
    <set name="NME_OPENAL" value="1" if="emscripten" />
 
-   <set name="NME_CAMERA" value="1" unless="emscripten||winrt" />
+   <!--   <set name="NME_CAMERA" value="1" unless="emscripten||winrt" />-->
+   <set name="NME_NO_CAMERA" value="1" />
 
    <!-- Built relative to "bin" -->
    <set name="NME_ROOT" value="" />
@@ -561,8 +562,8 @@
             <vflag name="-framework" value="OpenGL" if="NME_OGL" />
             <vflag name="-framework" value="AppKit" />
             <vflag name="-framework" value="OpenAL"/>
-            <vflag name="-framework" value="AVFoundation" if="NME_CAMERA"/>
-            <vflag name="-framework" value="CoreMedia" if="NME_CAMERA"/>
+            <vflag name="-framework" value="AVFoundation" />
+            <vflag name="-framework" value="CoreMedia" />
             <vflag name="-framework" value="CoreVideo" if="NME_CAMERA"/>
             <lib name="-liconv" />
          </section>

diff --git a/project/src/common/ExternalInterface.cpp b/project/src/common/ExternalInterface.cpp
@@ -294,7 +294,7 @@ extern "C" void InitIDs()
    _tile_rect = FRect(0, 0, 1, 1);
 
    #ifndef NME_NO_CAMERA
-   InitCamera();
+   //   InitCamera();
    #endif
 }