oops, don't build extras on android

Author: Velaron

CMakeLists.txt

@@ -108,41 +108,43 @@ if(ANDROID OR CMAKE_SIZEOF_VOID_P EQUAL 8)
 	set(VGUI_STATIC ON CACHE BOOL "" FORCE)
 	add_subdirectory(3rdparty/vgui_dll)
 
-    set(XASH_SDK ${CMAKE_CURRENT_SOURCE_DIR})
-    add_subdirectory(3rdparty/vgui_support)
+	set(XASH_SDK ${CMAKE_CURRENT_SOURCE_DIR})
+	add_subdirectory(3rdparty/vgui_support)
 elseif(BUILD_VGUI)
-    add_subdirectory(3rdparty/vgui_dll)
+	add_subdirectory(3rdparty/vgui_dll)
 endif()
 
 if(BUILD_PMAN)
 	add_definitions(-DUSE_PARTICLEMAN)
 	add_subdirectory(3rdparty/particleman)
 endif()
 
-set(EXTRAS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/tf15client-extras")
-file(GLOB_RECURSE EXTRAS_FILES "${EXTRAS_DIR}/*")
-
-set(EXTRAS_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/extras.pk3")
-
-add_custom_command(
-	OUTPUT ${EXTRAS_OUTPUT}
-	COMMAND ${Python_EXECUTABLE}
-			${CMAKE_CURRENT_SOURCE_DIR}/scripts/pack_extras.py
-			${EXTRAS_DIR}
-			${EXTRAS_OUTPUT}
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pack_extras.py
-			${EXTRAS_FILES}
-	COMMENT "Generating extras.pk3..."
-)
-
-add_custom_target(generate_extras ALL
-	DEPENDS ${EXTRAS_OUTPUT}
-)
-
-install(
-	FILES "${EXTRAS_OUTPUT}"
-	DESTINATION ${GAME_DIR}
-)
+if(NOT ANDROID)
+	set(EXTRAS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/tf15client-extras")
+	file(GLOB_RECURSE EXTRAS_FILES "${EXTRAS_DIR}/*")
+	
+	set(EXTRAS_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/extras.pk3")
+	
+	add_custom_command(
+		OUTPUT ${EXTRAS_OUTPUT}
+		COMMAND ${Python_EXECUTABLE}
+				${CMAKE_CURRENT_SOURCE_DIR}/scripts/pack_extras.py
+				${EXTRAS_DIR}
+				${EXTRAS_OUTPUT}
+		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/pack_extras.py
+				${EXTRAS_FILES}
+		COMMENT "Generating extras.pk3..."
+	)
+	
+	add_custom_target(generate_extras ALL
+		DEPENDS ${EXTRAS_OUTPUT}
+	)
+	
+	install(
+		FILES "${EXTRAS_OUTPUT}"
+		DESTINATION ${GAME_DIR}
+	)
+endif()
 
 if(WIN32)
 	set(CPACK_GENERATOR "ZIP")

android/app/build.gradle

@@ -97,8 +97,10 @@ static def getBuildNum() {
 }
 
 def getGitHash() {
-    Process process = new ProcessBuilder("git", "rev-parse", "--short", "HEAD").directory(project.rootDir)
-            .redirectErrorStream(true).start()
+    Process process = new ProcessBuilder("git", "rev-parse", "--short", "HEAD")
+            .directory(project.rootDir)
+            .redirectErrorStream(true)
+            .start()
     InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream())
     BufferedReader bufferedReader = new BufferedReader(inputStreamReader)
 

linux/Dockerfile

@@ -0,0 +1,7 @@
+FROM registry.gitlab.steamos.cloud/steamrt/scout/sdk:latest
+
+WORKDIR /app
+
+COPY . .
+
+#CMD cd linux && make

linux/Makefile.tfc_cdll

@@ -18,7 +18,7 @@ PM_SHARED_OBJ_DIR=$(TFC_OBJ_DIR)/pm_shared
 CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) -DCLIENT_DLL -DCLIENT_WEAPONS -DGOLDSOURCE_SUPPORT -I/usr/include/malloc -D_snwprintf=swprintf \
 		 -DDISABLE_JUMP_ORIGIN -DDISABLE_VEC_ORIGIN
 
-INCLUDEDIRS=-I$(TFC_SRC_DIR) -I../dlls -I../tfc -I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR) -I../pm_shared -I../engine -I../vgui_dll/include -I../game_shared -I../external
+INCLUDEDIRS=-I$(TFC_SRC_DIR) -I../dlls -I../tfc -I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR) -I../pm_shared -I../engine -I../3rdparty/vgui_dll/include -I../game_shared -I../external
 
 ifeq ($(OS),Darwin)
 LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -framework Carbon $(CFG)/vgui.dylib -L. -lSDL2-2.0.0