fix linker conflicts, Hop does not run jGL's tests

JerboaBurrow · Jan 2, 2024 · 7298d86 · 7298d86
1 parent b4afa64
commit 7298d86
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml
@@ -38,7 +38,7 @@ jobs:
       working-directory: ${{github.workspace}}/build
       # Execute tests defined by the CMake configuration.
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: MESA_GL_VERSION_OVERRIDE=3.3 ctest --exclude-regex Vulkan
+      run: ctest
 
     - name: buildArtifact
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -28,4 +28,4 @@ jobs:
       working-directory: ${{github.workspace}}/build
       # Execute tests defined by the CMake configuration.
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: MESA_GL_VERSION_OVERRIDE=3.3 ctest --exclude-regex Vulkan
+      run: ctest 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -93,7 +93,10 @@ file(GLOB LUA_SRC "include/vendored/lua/src/*.c")
 include_directories(include/vendored/lua/src)
 add_library(Lua STATIC ${LUA_SRC})
 
+set(TMP ${TEST_SUITE})
+set(TEST_SUITE Off)
 add_subdirectory(include/jGL)
+set(TEST_SUITE ${TMP})
 
 add_subdirectory(include/vendored/ogg)
 set(${VORBIS_INCLUDE_DIRS} include/vendored/ogg/include)
@@ -142,7 +145,7 @@ endif()
 
 
 target_compile_definitions(Hop PUBLIC GLSL_VERSION="330")
-target_link_libraries(Hop jGL zlibstatic stduuid Lua Miniaudio)
+target_link_libraries(Hop PUBLIC jGL zlibstatic stduuid Lua Miniaudio)
 
 add_library(FreeType ALIAS freetype)
 

diff --git a/build.sh b/build.sh
@@ -52,6 +52,7 @@ function buildAndroid()
   # 24 required for vulkan https://github.com/nihui/ncnn-android-yolov5/issues/10#issuecomment-800374356
   cmake -E chdir build-$1 cmake .. -D ANDROID=ON -D ANDROID_PLATFORM=24 -D ANDROID_ABI=$1 -D BUILD_DEMOS=$DEMO -D RELEASE=$RELEASE -D TEST_SUITE=$TEST -D SYNTAX_ONLY=$SYNTAX -D SANITISE=$SANITISE -D CMAKE_TOOLCHAIN_FILE=$TOOL_CHAIN && make -j 4 -C build-$1
 
+  mv build-$1/libjGL.a build/libjGL-$1.a 
   mergeLibs "build-$1"
   mv build-$1/libHop.a build/libHop-$1.a
   mv build-$1/include/vendored/ogg/include/ogg/config_types.h include/vendored/ogg/include/ogg/
@@ -216,7 +217,6 @@ else
   cd build && make -j 4 && cd ..
 fi
 
-
 if [[ -z "$ANDROID_NDK" ]]
 then 
   mergeLibs "build"

diff --git a/demo/android/perlinWorld/app/build.gradle b/demo/android/perlinWorld/app/build.gradle
@@ -22,7 +22,7 @@ android {
 
     defaultConfig {
         applicationId "app.jerboa.glskeleton"
-        minSdk 23
+        minSdk 24
         targetSdk 33
         versionCode 1
         versionName "0.0.0"
@@ -33,7 +33,7 @@ android {
         }
         externalNativeBuild {
             cmake {
-                cppFlags ''
+                cppFlags "-std=c++17"
             }
         }
     }

diff --git a/demo/android/perlinWorld/app/src/main/cpp/CMakeLists.txt b/demo/android/perlinWorld/app/src/main/cpp/CMakeLists.txt
@@ -7,7 +7,7 @@
 cmake_minimum_required(VERSION 3.22.1)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_BUILD_TYPE MinSizeRel)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -std=c++17")
 # Declares and names the project.
 project("HopAndroid")
 
@@ -45,6 +45,7 @@ target_compile_definitions(HopAndroid PUBLIC GLSL_VERSION="300 es")
 target_compile_definitions(HopAndroid PUBLIC BENCHMARK)
 target_compile_definitions(HopAndroid PUBLIC ANDROID)
 set(libHop ${CMAKE_SOURCE_DIR}/include/libHop-${CMAKE_ANDROID_ARCH_ABI}.a)
+#set(libjGL ${CMAKE_SOURCE_DIR}/include/libjGL-${CMAKE_ANDROID_ARCH_ABI}.a)
 # Specifies libraries CMake should link to your target library. You
 # can link multiple libraries, such as libraries you define in this
 # build script, prebuilt third-party libraries, or system libraries.

diff --git a/demo/android/perlinWorld/app/src/main/cpp/hopAndroid.cpp b/demo/android/perlinWorld/app/src/main/cpp/hopAndroid.cpp
@@ -157,6 +157,7 @@ extern "C"
 
             collisions->setDetector(std::move(det));
             collisions->setResolver(std::move(res));
+
         }
 
     #include <world.cpp>

diff --git a/include/Object/id.h b/include/Object/id.h
@@ -1,5 +1,5 @@
-#ifndef ID_H
-#define ID_H
+#ifndef HOP_ID_H
+#define HOP_ID_H
 
 #include "uuid.h"
 #include <ostream>

diff --git a/include/gl.h b/include/gl.h
@@ -1,5 +1,5 @@
-#ifndef GL_H
-#define GL_H
+#ifndef HOP_GL_H
+#define HOP_GL_H
 
 #ifdef ANDROID
 

diff --git a/include/jGL b/include/jGL
-Original file line number
+Diff line change
@@ Expand Up / @@ -157,6 +157,7 @@ extern "C" @@
                 collisions->setDetector(std::move(det));
                 collisions->setResolver(std::move(res));
             }
         #include <world.cpp>
@@ Expand Down @@