Integrate changes from the template project

CMakeLists.txt

@@ -6,6 +6,9 @@ get_filename_component(PARENT_BINARY_DIR ${CMAKE_BINARY_DIR} DIRECTORY)
 
 include(package_info)
 include(package_check_info)
+if(COMMAND callback_start)
+	callback_start()
+endif()
 
 project(${PACKAGE_NAME})
 
@@ -25,6 +28,10 @@ endif()
 include(package_get_version)
 include(package_installation)
 
+if(COMMAND callback_before_target)
+	callback_before_target()
+endif()
+
 add_executable(${PACKAGE_EXE_NAME} ${PACKAGE_SOURCES})
 include(package_generated_sources)
 target_sources(${PACKAGE_EXE_NAME} PRIVATE ${GENERATED_SOURCES})
@@ -33,6 +40,9 @@ if(NOT DEFAULT_DATA_DIR_DIST) # Don't set the startup project if it wouldn't fin
 	set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${PACKAGE_EXE_NAME})
 endif()
 
+if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/${PACKAGE_INCLUDE_DIR})
+	target_include_directories(${PACKAGE_EXE_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/${PACKAGE_INCLUDE_DIR})
+endif()
 if(IS_DIRECTORY ${GENERATED_INCLUDE_DIR})
 	target_include_directories(${PACKAGE_EXE_NAME} PRIVATE ${GENERATED_INCLUDE_DIR})
 endif()
@@ -71,16 +81,20 @@ if(PACKAGE_DEFAULT_DATA_DIR)
 	target_compile_definitions(${PACKAGE_EXE_NAME} PRIVATE "PACKAGE_DEFAULT_DATA_DIR=\"${PACKAGE_DEFAULT_DATA_DIR}\"")
 endif()
 
+if(COMMAND callback_after_target)
+	callback_after_target()
+endif()
+
 if(EMSCRIPTEN)
 	target_compile_options(${PACKAGE_EXE_NAME} PRIVATE "SHELL:--preload-file ${PACKAGE_DATA_DIR}/data@ --no-heap-copy")
 	target_link_options(${PACKAGE_EXE_NAME} PRIVATE "SHELL:--preload-file ${PACKAGE_DATA_DIR}/data@ --no-heap-copy")
 	configure_file(${CMAKE_SOURCE_DIR}/emscripten_shell.html.in ${CMAKE_BINARY_DIR}/${PACKAGE_EXE_NAME}.html @ONLY)
 	install(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_EXE_NAME}.html DESTINATION ${RUNTIME_INSTALL_DESTINATION})
 	install(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_EXE_NAME}.data DESTINATION ${RUNTIME_INSTALL_DESTINATION})
 	install(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_EXE_NAME}.wasm DESTINATION ${RUNTIME_INSTALL_DESTINATION})
-	if(EXISTS ${PACKAGE_DATA_DIR}/icons/ncPong.ico)
-		file(COPY ${PACKAGE_DATA_DIR}/icons/ncPong.ico DESTINATION ${CMAKE_BINARY_DIR})
-		file(RENAME ${CMAKE_BINARY_DIR}/ncPong.ico ${CMAKE_BINARY_DIR}/favicon.ico)
+	if(EXISTS ${PACKAGE_DATA_DIR}/icons/icon.ico)
+		file(COPY ${PACKAGE_DATA_DIR}/icons/icon.ico DESTINATION ${CMAKE_BINARY_DIR})
+		file(RENAME ${CMAKE_BINARY_DIR}/icon.ico ${CMAKE_BINARY_DIR}/favicon.ico)
 		install(FILES ${CMAKE_BINARY_DIR}/favicon.ico DESTINATION ${RUNTIME_INSTALL_DESTINATION})
 	endif()
 endif()
@@ -109,6 +123,6 @@ endif()
 include(package_copy_targets)
 include(package_build_android)
 include(package_strip_binaries)
-if(NOT EMSCRIPTEN)
-	include(ncpong_lua)
+if(COMMAND callback_end)
+	callback_end()
 endif()

Info.plist.in

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>@CPACK_BUNDLE_NAME@.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>io.github.ncine.ncpong</string>
+	<string>@PACKAGE_REVERSE_DNS@</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -27,7 +27,7 @@
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright ©2011-2019 Angelo Theodorou</string>
+	<string>Copyright ©2011-2019 @PACKAGE_VENDOR@</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 </dict>

android/src/main/cpp/CMakeLists.txt.in

@@ -27,12 +27,16 @@ add_library(native_app_glue STATIC ${ANDROID_NDK}/sources/android/native_app_glu
 target_link_libraries(native_app_glue PRIVATE android log)
 add_library(game SHARED ${SOURCES})
 target_link_libraries(game PRIVATE native_app_glue ncine_main ncine)
-target_include_directories(game PRIVATE @NCPONG_INCLUDE_DIR@ ${ANDROID_NDK}/sources/android/native_app_glue)
+target_include_directories(game PRIVATE ${ANDROID_NDK}/sources/android/native_app_glue)
 
 # Convert strings back to the original lists
 string(REPLACE " " ";" GENERATED_SOURCES "${GENERATED_SOURCES}")
 string(REPLACE " " ";" ANDROID_GENERATED_FLAGS "${ANDROID_GENERATED_FLAGS}")
 
+if(IS_DIRECTORY "@ANDROID_INCLUDE_DIR@")
+	target_include_directories(game PRIVATE "@ANDROID_INCLUDE_DIR@")
+endif()
+
 target_sources(game PRIVATE ${GENERATED_SOURCES})
 if(IS_DIRECTORY ${GENERATED_INCLUDE_DIR})
 	target_include_directories(game PRIVATE ${GENERATED_INCLUDE_DIR})

android/src/main/java/LoadLibraries.java.in

@@ -10,9 +10,9 @@ public class LoadLibraries extends NativeActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		//Hide toolbar
+		// Hide toolbar
 		int SDK_INT = android.os.Build.VERSION.SDK_INT;
-		if(SDK_INT >= 19)
+		if (SDK_INT >= 19)
 		{
 			setImmersiveSticky();
 
@@ -32,18 +32,18 @@ public class LoadLibraries extends NativeActivity {
 	protected void onResume() {
 		super.onResume();
 
-		//Hide toolbar
+		// Hide toolbar
 		int SDK_INT = android.os.Build.VERSION.SDK_INT;
-		if(SDK_INT >= 11 && SDK_INT < 14)
+		if (SDK_INT >= 11 && SDK_INT < 14)
 		{
 			getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_HIDDEN);
 		}
-		else if(SDK_INT >= 14 && SDK_INT < 19)
+		else if (SDK_INT >= 14 && SDK_INT < 19)
 		{
 			getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN |
 			                                                 View.SYSTEM_UI_FLAG_LOW_PROFILE);
 		}
-		else if(SDK_INT >= 19)
+		else if (SDK_INT >= 19)
 		{
 			setImmersiveSticky();
 		}
@@ -61,7 +61,12 @@ public class LoadLibraries extends NativeActivity {
 
 	static {
 		System.loadLibrary("openal");
-		System.loadLibrary("ncine");
+
+		try {
+			System.loadLibrary("ncine");
+		} catch (UnsatisfiedLinkError e) {
+			System.err.println("Caught UnsatisfiedLinkError: " + e.getMessage());
+		}
 	}
 
 }

android/src/main/java/LoadLibrariesTV.java.in

@@ -8,7 +8,12 @@ public class LoadLibrariesTV extends NativeActivity {
 
 	static {
 		System.loadLibrary("openal");
-		System.loadLibrary("ncine");
+
+		try {
+			System.loadLibrary("ncine");
+		} catch (UnsatisfiedLinkError e) {
+			System.err.println("Caught UnsatisfiedLinkError: " + e.getMessage());
+		}
 	}
 
 }

android/src/main/res/values/strings.xml.in

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">@PACKAGE_NAME@</string>
+	<string name="app_name">@PACKAGE_NAME@</string>
 </resources>