Icarus Starship Command Simulator: support

Author: glKarin

.github/workflows/android.yml

@@ -79,7 +79,7 @@ jobs:
         echo "<<< disk usage"
         echo "Build Source libraries"
         # ,-DBUILD_SOURCE_HL2=OFF,-DBUILD_SOURCE_HL2MP=OFF,-DBUILD_SOURCE_EPISODIC=OFF,-DBUILD_SOURCE_HL1=OFF,-DBUILD_SOURCE_HL1MP=OFF,-DBUILD_SOURCE_PORTAL=OFF
-        bargs="$barch -Pcmake_options=-DGAME_DOOM3=OFF,-DGAME_RTCW=OFF,-DGAME_QUAKE3=OFF,-DGAME_QUAKE2=OFF,-DGAME_QUAKE1=OFF,-DGAME_TDM=OFF,-DGAME_DOOM3BFG=OFF,-DGAME_DOOM=OFF,-DGAME_ETW=OFF,-DGAME_REALRTCW=OFF,-DGAME_FTEQW=OFF,-DGAME_JK=OFF,-DGAME_SERIOUSSAM=OFF,-DGAME_REALRTCW=OFF,-DGAME_URT=OFF,-DGAME_OPENMOHAA=OFF,-DGAME_WOLF3D=OFF,-DGAME_SKINDEEP=OFF,-DGAME_QC=OFF,-DGAME_XASH3D=OFF"
+        bargs="$barch -Pcmake_options=-DGAME_DOOM3=OFF,-DGAME_RTCW=OFF,-DGAME_QUAKE3=OFF,-DGAME_QUAKE2=OFF,-DGAME_QUAKE1=OFF,-DGAME_TDM=OFF,-DGAME_DOOM3BFG=OFF,-DGAME_DOOM=OFF,-DGAME_ETW=OFF,-DGAME_REALRTCW=OFF,-DGAME_FTEQW=OFF,-DGAME_JK=OFF,-DGAME_SERIOUSSAM=OFF,-DGAME_REALRTCW=OFF,-DGAME_URT=OFF,-DGAME_OPENMOHAA=OFF,-DGAME_WOLF3D=OFF,-DGAME_SKINDEEP=OFF,-DGAME_QC=OFF,-DGAME_ICARUS=OFF,-DGAME_XASH3D=OFF"
         ./gradlew assembleRelease $bargs
         echo "disk usage: >>>"
         df -h
@@ -129,6 +129,7 @@ jobs:
         cp -f Q3E/build/intermediates/library_jni/release/jni/${arch}/libhardqore.so Q3E/libs/${arch}
         cp -f Q3E/build/intermediates/library_jni/release/jni/${arch}/libpreygame.so Q3E/libs/${arch}
         cp -f Q3E/build/intermediates/library_jni/release/jni/${arch}/libqc.so Q3E/libs/${arch}
+        cp -f Q3E/build/intermediates/library_jni/release/jni/${arch}/libICARUS.so Q3E/libs/${arch}
         ls Q3E/libs/${arch}
         # build non-idTech4 only
         echo "Clean builds"
@@ -142,7 +143,7 @@ jobs:
         du -ch | tail -n -1
         echo "<<< disk usage"
         echo "Build final apk"
-        bargs="$barch -Pcmake_options=-DGAME_SOURCE=OFF,-DGAME_DOOM3=OFF,-DGAME_DOOM3BFG=OFF,-DGAME_TDM=OFF,-DGAME_QC=OFF"
+        bargs="$barch -Pcmake_options=-DGAME_SOURCE=OFF,-DGAME_DOOM3=OFF,-DGAME_DOOM3BFG=OFF,-DGAME_TDM=OFF,-DGAME_QC=OFF,-DGAME_ICARUS=OFF"
         ./gradlew assembleRelease $bargs
         echo "disk usage: >>>"
         df -h

.github/workflows/android_armv7.yml

@@ -79,7 +79,7 @@ jobs:
         echo "<<< disk usage"
         echo "Build Source libraries"
         # ,-DBUILD_SOURCE_HL2=OFF,-DBUILD_SOURCE_HL2MP=OFF,-DBUILD_SOURCE_EPISODIC=OFF,-DBUILD_SOURCE_HL1=OFF,-DBUILD_SOURCE_HL1MP=OFF,-DBUILD_SOURCE_PORTAL=OFF
-        bargs="$barch -Pcmake_options=-DGAME_DOOM3=OFF,-DGAME_RTCW=OFF,-DGAME_QUAKE3=OFF,-DGAME_QUAKE2=OFF,-DGAME_QUAKE1=OFF,-DGAME_TDM=OFF,-DGAME_DOOM3BFG=OFF,-DGAME_DOOM=OFF,-DGAME_ETW=OFF,-DGAME_REALRTCW=OFF,-DGAME_FTEQW=OFF,-DGAME_JK=OFF,-DGAME_SERIOUSSAM=OFF,-DGAME_REALRTCW=OFF,-DGAME_URT=OFF,-DGAME_OPENMOHAA=OFF,-DGAME_WOLF3D=OFF,-DGAME_SKINDEEP=OFF,-DGAME_QC=OFF,-DGAME_XASH3D=OFF"
+        bargs="$barch -Pcmake_options=-DGAME_DOOM3=OFF,-DGAME_RTCW=OFF,-DGAME_QUAKE3=OFF,-DGAME_QUAKE2=OFF,-DGAME_QUAKE1=OFF,-DGAME_TDM=OFF,-DGAME_DOOM3BFG=OFF,-DGAME_DOOM=OFF,-DGAME_ETW=OFF,-DGAME_REALRTCW=OFF,-DGAME_FTEQW=OFF,-DGAME_JK=OFF,-DGAME_SERIOUSSAM=OFF,-DGAME_REALRTCW=OFF,-DGAME_URT=OFF,-DGAME_OPENMOHAA=OFF,-DGAME_WOLF3D=OFF,-DGAME_SKINDEEP=OFF,-DGAME_QC=OFF,-DGAME_ICARUS=OFF,-DGAME_XASH3D=OFF"
         ./gradlew assembleRelease $bargs
         echo "disk usage: >>>"
         df -h
@@ -129,6 +129,7 @@ jobs:
         cp -f Q3E/build/intermediates/library_jni/release/jni/${arch}/libhardqore.so Q3E/libs/${arch}
         cp -f Q3E/build/intermediates/library_jni/release/jni/${arch}/libpreygame.so Q3E/libs/${arch}
         cp -f Q3E/build/intermediates/library_jni/release/jni/${arch}/libqc.so Q3E/libs/${arch}
+        cp -f Q3E/build/intermediates/library_jni/release/jni/${arch}/libICARUS.so Q3E/libs/${arch}
         ls Q3E/libs/${arch}
         # build non-idTech4 only
         echo "Clean builds"
@@ -142,7 +143,7 @@ jobs:
         du -ch | tail -n -1
         echo "<<< disk usage"
         echo "Build final apk"
-        bargs="$barch -Pcmake_options=-DGAME_SOURCE=OFF,-DGAME_DOOM3=OFF,-DGAME_DOOM3BFG=OFF,-DGAME_TDM=OFF,-DGAME_QC=OFF"
+        bargs="$barch -Pcmake_options=-DGAME_SOURCE=OFF,-DGAME_DOOM3=OFF,-DGAME_DOOM3BFG=OFF,-DGAME_TDM=OFF,-DGAME_QC=OFF,-DGAME_ICARUS=OFF"
         ./gradlew assembleRelease $bargs
         echo "disk usage: >>>"
         df -h

Q3E/src/main/java/com/n0n3m4/q3e/Q3EGame.java

@@ -176,6 +176,13 @@ public enum Q3EGame
             Q3EPreference.pref_harm_qc_fs_game, Q3EPreference.pref_harm_qc_user_mod, Q3EPreference.pref_harm_qc_game_mod, Q3EPreference.pref_harm_qc_game_lib, Q3EPreference.pref_params_qc, Q3EPreference.pref_harm_qc_command_record, null, Q3EPreference.pref_harm_qc_env,
             KeyCodesAndroid.class, Q3EGameConstants.FEATURE_QC
     ),
+
+    ICARUS(Q3EGameConstants.GAME_ID_ICARUS, Q3EGameConstants.GAME_ICARUS, Q3EGameConstants.LIB_ENGINE4_ICARUS, Q3EGameConstants.GAME_NAME_ICARUS, Q3EGameConstants.GAME_BASE_ICARUS,
+            Q3EGameConstants.GAME_VERSION_ICARUS, Q3EGameConstants.GAME_SUBDIR_ICARUS, Q3EGameConstants.CONFIG_FILE_ICARUS,
+            "fs_game", "fs_game_base", null, null,
+            Q3EPreference.pref_harm_icarus_fs_game, Q3EPreference.pref_harm_icarus_user_mod, Q3EPreference.pref_harm_icarus_game_mod, Q3EPreference.pref_harm_icarus_game_lib, Q3EPreference.pref_params_icarus, Q3EPreference.pref_harm_icarus_command_record, null, Q3EPreference.pref_harm_icarus_env,
+            KeyCodesAndroid.class, Q3EGameConstants.FEATURE_ICARUS
+    ),
     ;
 
     public final int    ID;

Q3E/src/main/java/com/n0n3m4/q3e/Q3EGameConstants.java

@@ -29,6 +29,7 @@ public final class Q3EGameConstants
     public static final String LIB_ENGINE1_WOLF3D   = "libecwolf.so"; // Wolfenstein 3D
     public static final String LIB_ENGINE4_SKINDEEP = "libskindeep.so"; // Skin Deep
     public static final String LIB_ENGINE4_QC       = "libqc.so"; // Quadrilateral Cowboy
+    public static final String LIB_ENGINE4_ICARUS       = "libICARUS.so"; // Icarus Starship Command Simulator
 
 
     // game engine version
@@ -72,6 +73,7 @@ public final class Q3EGameConstants
     public static final String CONFIG_FILE_WOLF3D   = "ecwolf.cfg";
     public static final String CONFIG_FILE_SKINDEEP = "settings.cfg";
     public static final String CONFIG_FILE_QC       = "DoomConfig.cfg";
+    public static final String CONFIG_FILE_ICARUS       = "IcarusConfig.cfg";
 
     // game type token
     public static final String GAME_DOOM3    = "doom3";
@@ -98,6 +100,7 @@ public final class Q3EGameConstants
     public static final String GAME_WOLF3D   = "ecwolf";
     public static final String GAME_SKINDEEP = "skindeep";
     public static final String GAME_QC       = "qc";
+    public static final String GAME_ICARUS       = "icarus";
 
     // game name
     public static final String GAME_NAME_DOOM3    = "DOOM 3";
@@ -124,6 +127,7 @@ public final class Q3EGameConstants
     public static final String GAME_NAME_WOLF3D   = "Wolfenstein 3D";
     public static final String GAME_NAME_SKINDEEP = "Skin Deep";
     public static final String GAME_NAME_QC       = "QC";
+    public static final String GAME_NAME_ICARUS       = "Icarus";
 
     // game base folder
     public static final String GAME_BASE_DOOM3      = "base";
@@ -152,6 +156,7 @@ public final class Q3EGameConstants
     public static final String GAME_BASE_WOLF3D     = ""; // ECWolf is standalone
     public static final String GAME_BASE_SKINDEEP   = "base";
     public static final String GAME_BASE_QC         = "base";
+    public static final String GAME_BASE_ICARUS         = "base";
 
     // game standalone directory
     public static final String GAME_SUBDIR_DOOM3    = "doom3";
@@ -178,6 +183,7 @@ public final class Q3EGameConstants
     public static final String GAME_SUBDIR_WOLF3D   = "ecwolf";
     public static final String GAME_SUBDIR_SKINDEEP = "skindeep";
     public static final String GAME_SUBDIR_QC       = "qc";
+    public static final String GAME_SUBDIR_ICARUS       = "icarus";
 
     // game version
     public static final String GAME_VERSION_DOOM3    = "1.3.1.1304";
@@ -204,6 +210,7 @@ public final class Q3EGameConstants
     public static final String GAME_VERSION_WOLF3D   = "1.4.2";
     public static final String GAME_VERSION_SKINDEEP = "1.0.4";
     public static final String GAME_VERSION_QC       = "1.0.2602252";
+    public static final String GAME_VERSION_ICARUS       = "1.0.9";
 
     // game type index(ID)
     public static final int GAME_ID_DOOM3    = 0;
@@ -230,10 +237,11 @@ public final class Q3EGameConstants
     public static final int GAME_ID_WOLF3D   = 21;
     public static final int GAME_ID_SKINDEEP = 22;
     public static final int GAME_ID_QC       = 23;
+    public static final int GAME_ID_ICARUS       = 24;
 
 
     // KARIN_NEW_GAME_BOOKMARK: increment
-    public static final int NUM_SUPPORT_GAME = 24;
+    public static final int NUM_SUPPORT_GAME = 25;
 
     public static final String GAME_EXECUABLE = "game.arm";
 
@@ -365,7 +373,7 @@ public enum PatchResource
     public static final int VIRTUAL_MOUSE     = 1 << 10;
     public static final int OPENGL_VERSION    = 1 << 11;
 
-    // KARIN_DISABLE_GAME_BOOKMARK: add game feature flags
+    // KARIN_NEW_GAME_BOOKMARK: add game feature flags
     public static final int FEATURE_DOOM3    = SUPPORT_MOD | SECONDARY_DIR | EXTERNAL_DLL | USING_OPENAL | SKIP_INTRO | QUICK_LOAD | OPENGL_VERSION;
     public static final int FEATURE_QUAKE4   = FEATURE_DOOM3;
     public static final int FEATURE_PREY     = FEATURE_DOOM3;
@@ -390,6 +398,7 @@ public enum PatchResource
     public static final int FEATURE_WOLF3D   = SUPPORT_MOD | ALWAYS_STANDALONE | USING_SDL;
     public static final int FEATURE_SKINDEEP = SUPPORT_MOD | USING_SDL | SECONDARY_DIR | USING_OPENAL | SKIP_INTRO;
     public static final int FEATURE_QC       = SUPPORT_MOD | USING_SDL | SECONDARY_DIR | USING_OPENAL | SKIP_INTRO | QUICK_LOAD | OPENGL_VERSION;
+    public static final int FEATURE_ICARUS       = SUPPORT_MOD | USING_SDL | SECONDARY_DIR | USING_OPENAL | SKIP_INTRO | QUICK_LOAD | OPENGL_VERSION;
 
     private Q3EGameConstants() {}
 }

Q3E/src/main/java/com/n0n3m4/q3e/Q3EGameHelper.java

@@ -330,7 +330,7 @@ else if(Q3E.q3ei.isD3)
             cmd = command.toString();
         }
 
-        if(Q3E.q3ei.IsIdTech4() || Q3E.q3ei.isQC)
+        if(Q3E.q3ei.IsIdTech4() || Q3E.q3ei.isQC || Q3E.q3ei.isIcarus)
         {
             KidTechCommand command = Q3E.q3ei.GetGameCommandEngine(cmd);
             int glVersion = preferences.getInt(Q3EPreference.pref_harm_opengl, Q3EGLConstants.GetPreferOpenGLESVersion());

Q3E/src/main/java/com/n0n3m4/q3e/Q3EInterface.java

@@ -83,6 +83,7 @@ public class Q3EInterface
 	public boolean isWolf3D = false;
 	public boolean isSkinDeep = false;
 	public boolean isQC = false;
+	public boolean isIcarus = false;
 
 	public String default_path = Environment.getExternalStorageDirectory() + "/diii4a";
 
@@ -220,6 +221,8 @@ else if(isSkinDeep)
 			return Q3EGameConstants.GAME_ID_SKINDEEP;
 		else if(isQC)
 			return Q3EGameConstants.GAME_ID_QC;
+		else if(isIcarus)
+			return Q3EGameConstants.GAME_ID_ICARUS;
 		else
 			return Q3EGameConstants.GAME_ID_DOOM3;
 	}
@@ -296,6 +299,8 @@ else if(Q3EGameConstants.GAME_SKINDEEP.equalsIgnoreCase(name))
 			SetupSkinDeep();
 		else if(Q3EGameConstants.GAME_QC.equalsIgnoreCase(name))
 			SetupQC();
+		else if(Q3EGameConstants.GAME_ICARUS.equalsIgnoreCase(name))
+			SetupIcarus();
 		else
 			SetupDOOM3();
 	}
@@ -327,6 +332,7 @@ public void ResetGameState()
 		isWolf3D = false;
 		isSkinDeep = false;
 		isQC = false;
+		isIcarus = false;
 	}
 
 	public void SetupDOOM3()
@@ -499,10 +505,17 @@ public void SetupQC()
 		SetupGameConfig();
 	}
 
+	public void SetupIcarus()
+	{
+		ResetGameState();
+		isIcarus = true;
+		SetupGameConfig();
+	}
+
 	public boolean IsInitGame()
 	{
 		return isD3 || isQ4 || isPrey
-				|| isD3BFG || isTDM || isSkinDeep || isQC
+				|| isD3BFG || isTDM || isSkinDeep || isQC || isIcarus
 				|| isRTCW || isQ3 || isETW || isRealRTCW || isFTEQW || isJA || isJO || isUrT || isMOHAA
 				|| isQ2 || isQ1
 				|| isDOOM || isWolf3D
@@ -802,6 +815,12 @@ else if(isQC)
 			list.add("<mod>/autoexec.cfg");
 			list.add("<base>/autoexec.cfg");
 		}
+		else if(isIcarus)
+		{
+			list.add("<mod>/" + Q3EGameConstants.CONFIG_FILE_ICARUS);
+			list.add("<mod>/autoexec.cfg");
+			list.add("<base>/autoexec.cfg");
+		}
 		else
 		{
 			list.add("<mod>/" + Q3EGameConstants.CONFIG_FILE_DOOM3);

Q3E/src/main/java/com/n0n3m4/q3e/Q3EPreference.java

@@ -269,6 +269,15 @@ public final class Q3EPreference
     public static final String pref_harm_qc_command_record        = PREF_HARM_QC_PREFIX + "command_record";
     public static final String pref_harm_qc_env                   = PREF_HARM_QC_PREFIX + "env";
     public static final String pref_harm_qc_game_mod              = PREF_HARM_QC_PREFIX + "game_mod"; //k
+    // Icarus Starship Command Simulator
+    public static final String PREF_HARM_ICARUS_PREFIX                = "q3e_harm_icarus_";
+    public static final String pref_harm_icarus_fs_game               = PREF_HARM_ICARUS_PREFIX + "fs_game"; //k
+    public static final String pref_harm_icarus_game_lib              = PREF_HARM_ICARUS_PREFIX + "game_lib"; //k
+    public static final String pref_harm_icarus_user_mod              = PREF_HARM_ICARUS_PREFIX + "user_mod"; //k
+    public static final String pref_params_icarus                     = PREF_HARM_ICARUS_PREFIX + "params"; //k
+    public static final String pref_harm_icarus_command_record        = PREF_HARM_ICARUS_PREFIX + "command_record";
+    public static final String pref_harm_icarus_env                   = PREF_HARM_ICARUS_PREFIX + "env";
+    public static final String pref_harm_icarus_game_mod              = PREF_HARM_ICARUS_PREFIX + "game_mod"; //k
 
     public static final String pref_harm_view_motion_control_gyro     = "q3e_harm_mouse_move_control_gyro"; //k
     public static final String pref_harm_view_motion_gyro_x_axis_sens = "q3e_harm_view_motion_gyro_x_axis_sens"; //k

Q3E/src/main/jni/CMakeLists.txt

@@ -42,7 +42,7 @@ OPTION(GAME_OPENMOHAA               "Build Medal of Honor: Allied Assault"
 OPTION(GAME_WOLF3D                  "Build Wolfenstein 3D"                          ON)
 OPTION(GAME_SKINDEEP                "Build Skin Deep"                               ON)
 OPTION(GAME_QC                      "Build Quadrilateral Cowboy"                    ON)
-OPTION(GAME_ISCS                    "Build Icarus Starship Command Simulator"       OFF)
+OPTION(GAME_ICARUS                    "Build Icarus Starship Command Simulator"       ON)
 # Not in F-Droid
 if(NOT PRODUCT_FLAVOR_IS_FDROID)
 OPTION(GAME_XASH3D                  "Build Xash3D"                                  ON)
@@ -99,7 +99,7 @@ add_subdirectory( q3e )
 
 
 
-if(GAME_QUAKE3 OR GAME_QUAKE2 OR GAME_QUAKE1 OR GAME_RTCW OR GAME_ETW OR GAME_REALRTCW OR GAME_FTEQW OR GAME_QUAKES OR GAME_JK OR GAME_Q3RALLY OR GAME_URT OR GAME_OPENMOHAA OR GAME_SERIOUSSAM OR GAME_SKINDEEP OR GAME_QC OR GAME_ISCS)
+if(GAME_QUAKE3 OR GAME_QUAKE2 OR GAME_QUAKE1 OR GAME_RTCW OR GAME_ETW OR GAME_REALRTCW OR GAME_FTEQW OR GAME_QUAKES OR GAME_JK OR GAME_Q3RALLY OR GAME_URT OR GAME_OPENMOHAA OR GAME_SERIOUSSAM OR GAME_SKINDEEP OR GAME_QC OR GAME_ICARUS)
     set(DIII4A_BUILD_COMMON True)
 endif()
 
@@ -253,9 +253,9 @@ if(GAME_QC) #  | Apr 16, 2025 | https://github.com/blendogames/quadrilateralcowb
     add_subdirectory ( qc ) # Quadrilateral Cowboy
 endif()
 
-if(GAME_ISCS) #  | Apr 16, 2025 | https://github.com/blendogames/quadrilateralcowboy/commit/c7ec52ca117a3ef6b5420d2a4bb3f63a17be57f1 | Fix for occasional crash when pressing ESC during Moto Spectre sequence
+if(GAME_ICARUS) #  | Apr 16, 2025 | https://github.com/blendogames/quadrilateralcowboy/commit/c7ec52ca117a3ef6b5420d2a4bb3f63a17be57f1 | Fix for occasional crash when pressing ESC during Moto Spectre sequence
 message(STATUS "Build Icarus Starship Command Simulator")
-add_subdirectory ( iscs ) # Icarus Starship Command Simulator
+add_subdirectory ( icarus ) # Icarus Starship Command Simulator
 endif()
 
 

Q3E/src/main/jni/iscs/CMakeLists.txt Q3E/src/main/jni/icarus/CMakeLists.txtQ3E/src/main/jni/iscs/CMakeLists.txt renamed to Q3E/src/main/jni/icarus/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Written by Ethan "flibitijibibo" Lee
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
-PROJECT(ISCS)
+PROJECT(Icarus)
 
 set(DIII4A True)
 
@@ -17,7 +17,7 @@ OPTION(STEAM "Enable Steamworks" OFF)
 if(DIII4A)
 	add_definitions(-D_DIII4A) # android
 	add_definitions(-D_GLES) # GLES
-	add_definitions(-D_ISCS) # QC changes on renderer
+	add_definitions(-D_ICARUS) # Icarus changes on renderer
 	include_directories(d3xp)
 	include_directories(${DIII4A_DEPEND_COMMON_PATH})
 	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/renderer/jpeg-6)
@@ -507,12 +507,12 @@ ENDIF()
 # Executable information
 SET(CMAKE_WIN32_EXECUTABLE ON)
 IF(ANDROID)
-ADD_LIBRARY(qc SHARED ${QC_SRC})
+ADD_LIBRARY(ICARUS SHARED ${QC_SRC})
 ELSE()
-ADD_EXECUTABLE(qc ${QC_SRC})
+ADD_EXECUTABLE(ICARUS ${QC_SRC})
 ENDIF()
 
-set_target_properties(qc PROPERTIES
+set_target_properties(ICARUS PROPERTIES
     CXX_STANDARD 11
     CXX_STANDARD_REQUIRED ON)
 
@@ -526,21 +526,21 @@ elseif(APPLE)
 endif()
 if (DEFINED SDL2_INCLUDE_DIRS AND DEFINED SDL2_LIBRARIES)
 	message(STATUS "using pre-defined SDL2 variables SDL2_INCLUDE_DIRS and SDL2_LIBRARIES")
-	target_include_directories(qc PUBLIC "$<BUILD_INTERFACE:${SDL2_INCLUDE_DIRS}>")
-	target_link_libraries(qc PUBLIC ${SDL2_LIBRARIES})
+	target_include_directories(ICARUS PUBLIC "$<BUILD_INTERFACE:${SDL2_INCLUDE_DIRS}>")
+	target_link_libraries(ICARUS PUBLIC ${SDL2_LIBRARIES})
 else()
 	# Only try to autodetect if both SDL2 variables aren't explicitly set
 	find_package(SDL2 CONFIG)
 	if (TARGET SDL2::SDL2)
 		message(STATUS "using TARGET SDL2::SDL2")
-		target_link_libraries(qc PUBLIC SDL2::SDL2)
+		target_link_libraries(ICARUS PUBLIC SDL2::SDL2)
 	elseif (TARGET SDL2)
 		message(STATUS "using TARGET SDL2")
-		target_link_libraries(qc PUBLIC SDL2)
+		target_link_libraries(ICARUS PUBLIC SDL2)
 	else()
 		message(STATUS "no TARGET SDL2::SDL2, or SDL2, using variables")
-		target_include_directories(qc PUBLIC "$<BUILD_INTERFACE:${SDL2_INCLUDE_DIRS}>")
-		target_link_libraries(qc PUBLIC ${SDL2_LIBRARIES})
+		target_include_directories(ICARUS PUBLIC "$<BUILD_INTERFACE:${SDL2_INCLUDE_DIRS}>")
+		target_link_libraries(ICARUS PUBLIC ${SDL2_LIBRARIES})
 	endif()
 endif()
 
@@ -551,9 +551,9 @@ IF(APPLE)
 	FIND_LIBRARY(COCOA NAMES Cocoa)
 	FIND_LIBRARY(IOKIT NAMES IOKit)
 	FIND_LIBRARY(COREAUDIO NAMES CoreAudio)
-	TARGET_LINK_LIBRARIES(qc PUBLIC objc ${OPENGL} ${OPENAL} ${COCOA} ${IOKIT} ${COREAUDIO})
+	TARGET_LINK_LIBRARIES(ICARUS PUBLIC objc ${OPENGL} ${OPENAL} ${COCOA} ${IOKIT} ${COREAUDIO})
 ELSEIF(NOT WIN32)
-	TARGET_LINK_LIBRARIES(qc PUBLIC openal)
+	TARGET_LINK_LIBRARIES(ICARUS PUBLIC openal)
 ENDIF()
 IF(WIN32)
 	TARGET_LINK_LIBRARIES(qc PUBLIC
@@ -570,10 +570,11 @@ IF(WIN32)
 		${CMAKE_SOURCE_DIR}/openal/lib/eaxguid.lib
 	)
 ELSEIF (ANDROID)
-	TARGET_LINK_LIBRARIES(qc PUBLIC dl android)
+	TARGET_LINK_LIBRARIES(ICARUS PUBLIC dl android)
+	#set_target_properties(ICARUS PROPERTIES OUTPUT_NAME qc)
 ELSE()
-	TARGET_LINK_LIBRARIES(qc PUBLIC dl pthread)
+	TARGET_LINK_LIBRARIES(ICARUS PUBLIC dl pthread)
 ENDIF()
 IF(STEAM)
-	TARGET_LINK_LIBRARIES(qc PUBLIC steam_api)
+	TARGET_LINK_LIBRARIES(ICARUS PUBLIC steam_api)
 ENDIF()