diff --git a/.gitignore b/.gitignore index 664708a90..fd49bb598 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .idea -build .project *.kdev4* diff --git a/Build/Android/.gitignore b/Build/Android/.gitignore new file mode 100644 index 000000000..a4c783824 --- /dev/null +++ b/Build/Android/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/Build/Android/app/.gitignore b/Build/Android/app/.gitignore new file mode 100644 index 000000000..3543521e9 --- /dev/null +++ b/Build/Android/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Build/Android/app/CMakeLists.txt b/Build/Android/app/CMakeLists.txt new file mode 100644 index 000000000..7da22e121 --- /dev/null +++ b/Build/Android/app/CMakeLists.txt @@ -0,0 +1,46 @@ +# For more information about using CMake with Android Studio, read the +# documentation: https://d.android.com/studio/projects/add-native-code.html + +# Sets the minimum version of CMake required to build the native library. + +cmake_minimum_required(VERSION 3.4.1) + +# Creates and names a library, sets it as either STATIC +# or SHARED, and provides the relative paths to its source code. +# You can define multiple libraries, and CMake builds them for you. +# Gradle automatically packages shared libraries with your APK. + +add_subdirectory(../../../ ../CMakeOutput/) + +add_library( # Sets the name of the library. + native-lib + + # Sets the library as a shared library. + SHARED + + # Provides a relative path to your source file(s). + src/main/cpp/native-lib.cpp ) + +# Searches for a specified prebuilt library and stores the path as a +# variable. Because CMake includes system libraries in the search path by +# default, you only need to specify the name of the public NDK library +# you want to add. CMake verifies that the library exists before +# completing its build. + +find_library( # Sets the name of the path variable. + log-lib + + # Specifies the name of the NDK library that + # you want CMake to locate. + log ) + +# 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. + +target_link_libraries( # Specifies the target library. + native-lib + + # Links the target library to the log library + # included in the NDK. + ${log-lib} ) diff --git a/Build/Android/app/build.gradle b/Build/Android/app/build.gradle new file mode 100644 index 000000000..6aa845581 --- /dev/null +++ b/Build/Android/app/build.gradle @@ -0,0 +1,69 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.3" + defaultConfig { + applicationId "litteman.com.assimpbuilder" + minSdkVersion 9 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + productFlavors { + armeabi { + ndk { + abiFilter "armeabi" + } + } + armV7 { + ndk { + abiFilter "armeabi-v7a" + } + } + arm64V8 { + ndk { + abiFilter "arm64-v8a" + } + } + x86 { + ndk { + abiFilter "x86" + } + } + fat { + ndk { + abiFilter "armeabi" + abiFilter "armeabi-v7a" + abiFilter "arm64-v8a" + abiFilter "x86" + } + } + } + externalNativeBuild { + cmake { + //cppFlags "-std=c++11 -frtti -fexceptions" + } + } + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + externalNativeBuild { + cmake { + path "CMakeLists.txt" + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + //androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + // exclude group: 'com.android.support', module: 'support-annotations' + //}) + compile 'com.android.support:appcompat-v7:25.3.1' + testCompile 'junit:junit:4.12' +} diff --git a/Build/Android/app/proguard-rules.pro b/Build/Android/app/proguard-rules.pro new file mode 100644 index 000000000..e01b6b600 --- /dev/null +++ b/Build/Android/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\Android\sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/Build/Android/app/src/androidTest/java/litteman/com/assimpbuilder/ExampleInstrumentedTest.java b/Build/Android/app/src/androidTest/java/litteman/com/assimpbuilder/ExampleInstrumentedTest.java new file mode 100644 index 000000000..5d4a2c0ac --- /dev/null +++ b/Build/Android/app/src/androidTest/java/litteman/com/assimpbuilder/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package litteman.com.assimpbuilder; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("litteman.com.assimpbuilder", appContext.getPackageName()); + } +} diff --git a/Build/Android/app/src/main/AndroidManifest.xml b/Build/Android/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..ca632b9b0 --- /dev/null +++ b/Build/Android/app/src/main/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/Build/Android/app/src/main/cpp/native-lib.cpp b/Build/Android/app/src/main/cpp/native-lib.cpp new file mode 100644 index 000000000..2149d8fd4 --- /dev/null +++ b/Build/Android/app/src/main/cpp/native-lib.cpp @@ -0,0 +1,3 @@ +#include +#include + diff --git a/Build/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Build/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..cde69bccc Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/Build/Android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Build/Android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..9a078e3e1 Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/Build/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Build/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c133a0cbd Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/Build/Android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Build/Android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..efc028a63 Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/Build/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Build/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..bfa42f0e7 Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/Build/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Build/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..3af2608a4 Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/Build/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Build/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..324e72cdd Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/Build/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Build/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..9bec2e623 Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/Build/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Build/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..aee44e138 Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/Build/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Build/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..34947cd6b Binary files /dev/null and b/Build/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/Build/Android/app/src/main/res/values/colors.xml b/Build/Android/app/src/main/res/values/colors.xml new file mode 100644 index 000000000..2a12c47ca --- /dev/null +++ b/Build/Android/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/Build/Android/app/src/main/res/values/strings.xml b/Build/Android/app/src/main/res/values/strings.xml new file mode 100644 index 000000000..fbd199748 --- /dev/null +++ b/Build/Android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AssimpBuilder + diff --git a/Build/Android/app/src/main/res/values/styles.xml b/Build/Android/app/src/main/res/values/styles.xml new file mode 100644 index 000000000..941f060ee --- /dev/null +++ b/Build/Android/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/Build/Android/app/src/test/java/litteman/com/assimpbuilder/ExampleUnitTest.java b/Build/Android/app/src/test/java/litteman/com/assimpbuilder/ExampleUnitTest.java new file mode 100644 index 000000000..7d382d9da --- /dev/null +++ b/Build/Android/app/src/test/java/litteman/com/assimpbuilder/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package litteman.com.assimpbuilder; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/Build/Android/build.gradle b/Build/Android/build.gradle new file mode 100644 index 000000000..cfce2cac8 --- /dev/null +++ b/Build/Android/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.2.3' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/Build/Android/gradle.properties b/Build/Android/gradle.properties new file mode 100644 index 000000000..3530b0106 --- /dev/null +++ b/Build/Android/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/Build/Android/gradle/wrapper/gradle-wrapper.jar b/Build/Android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..13372aef5 Binary files /dev/null and b/Build/Android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Build/Android/gradle/wrapper/gradle-wrapper.properties b/Build/Android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..228412607 --- /dev/null +++ b/Build/Android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Aug 18 23:00:33 MSK 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/Build/Android/gradlew b/Build/Android/gradlew new file mode 100644 index 000000000..9d82f7891 --- /dev/null +++ b/Build/Android/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/Build/Android/gradlew.bat b/Build/Android/gradlew.bat new file mode 100644 index 000000000..aec99730b --- /dev/null +++ b/Build/Android/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Build/Android/settings.gradle b/Build/Android/settings.gradle new file mode 100644 index 000000000..d3db1092c --- /dev/null +++ b/Build/Android/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/CMakeLists.txt b/CMakeLists.txt index be7d46438..a6a18a8dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ OPTION( ASSIMP_BUILD_ZLIB ) option( ASSIMP_BUILD_ASSIMP_TOOLS "If the supplementary tools for Assimp are built in addition to the library." - ON + OFF ) option ( ASSIMP_BUILD_SAMPLES "If the official samples are built as well (needs Glut)." @@ -72,7 +72,7 @@ option ( ASSIMP_BUILD_SAMPLES ) OPTION ( ASSIMP_BUILD_TESTS "If the test suite for Assimp is built in addition to the library." - ON + OFF ) OPTION ( ASSIMP_COVERALLS "Eańable this to measure test coverage." @@ -353,6 +353,10 @@ ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) ADD_SUBDIRECTORY(contrib) + +set(ASSIMP_BUILD_FBX_IMPORTER ON CACHE BOOL "Overrided by Cross") +set(ASSIMP_BUILD_OBJ_IMPORTER ON CACHE BOOL "Overrided by Cross") +set(ASSIMP_BUILD_STL_IMPORTER ON CACHE BOOL "Overrided by Cross") ADD_SUBDIRECTORY( code/ ) IF ( ASSIMP_BUILD_ASSIMP_TOOLS ) IF ( WIN32 AND DirectX_D3DX9_LIBRARY ) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 0477f5fef..3a29cb030 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -192,7 +192,7 @@ ENDIF ( ASSIMP_BUILD_NONFREE_C4D_IMPORTER ) # ASSIMP_BUILD_XXX_IMPORTER to FALSE for each importer # if this variable is set to FALSE, the user can manually enable importers by setting # ASSIMP_BUILD_XXX_IMPORTER to TRUE for each importer -OPTION(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT "default value of all ASSIMP_BUILD_XXX_IMPORTER value" TRUE) +OPTION(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT "default value of all ASSIMP_BUILD_XXX_IMPORTER value" FALSE) # macro to add the CMake Option ADD_ASSIMP_IMPORTER_ which enables compile of loader # this way selective loaders can be compiled (reduces filesize + compile time)