diff --git a/Natives/AboutLauncherViewController.m b/Natives/AboutLauncherViewController.m index 91d50a40..aa87d0af 100644 --- a/Natives/AboutLauncherViewController.m +++ b/Natives/AboutLauncherViewController.m @@ -40,8 +40,7 @@ struct utsname systemInfo; uname(&systemInfo); - NSString* deviceModel = [NSString stringWithCString:systemInfo.machine - encoding:NSUTF8StringEncoding]; + NSString* deviceModel = [NSString stringWithCString:systemInfo.machine encoding:NSUTF8StringEncoding]; NSString *currSysVer = [[UIDevice currentDevice] systemVersion]; UILabel *logoVerView = [[UILabel alloc] initWithFrame:CGRectMake(20, 0, width, 30)]; diff --git a/Natives/CMakeLists.txt b/Natives/CMakeLists.txt index 2eedcfd9..085a28ce 100644 --- a/Natives/CMakeLists.txt +++ b/Natives/CMakeLists.txt @@ -4,7 +4,7 @@ project(PojavLauncher) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcommon -fobjc-arc -ObjC -I'${CMAKE_CURRENT_LIST_DIR}/resources/Frameworks/MetalANGLE.framework/Headers'") set(CMAKE_SHARED_LINKER_FLAGS "'${CMAKE_SHARED_LINKER_FLAGS}' -rpath @executable_path/Frameworks -rpath @loader_path/Frameworks") -add_executable(PojavLauncher main.c log.m JavaLauncher.c) +add_executable(PojavLauncher main.m log.m JavaLauncher.m) target_link_libraries(PojavLauncher "-framework UIKit" ) @@ -13,7 +13,7 @@ set_target_properties(PojavLauncher PROPERTIES MACOSX_FRAMEWORK_IDENTIFIER org.cmake.ExecutableTarget MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/Info.plist") -add_library(pojavexec SHARED log.m AppDelegate.m SceneDelegate.m UILauncher.m LauncherViewController.m LauncherPreferencesViewController.m LauncherFAQViewController.m LoginViewController.m SurfaceViewController.m UpdateHistoryViewController.m AboutLauncherViewController.m egl_bridge_ios.m ios_uikit_bridge.m customcontrols/ControlButton.m egl_bridge.c input_bridge_v3.c utils.c) +add_library(pojavexec SHARED log.m AppDelegate.m SceneDelegate.m UILauncher.m LauncherViewController.m LauncherPreferencesViewController.m LauncherFAQViewController.m LoginViewController.m SurfaceViewController.m UpdateHistoryViewController.m AboutLauncherViewController.m egl_bridge_ios.m ios_uikit_bridge.m customcontrols/ControlButton.m egl_bridge.m input_bridge_v3.m utils.m) target_link_libraries(pojavexec "-F'${CMAKE_CURRENT_LIST_DIR}/resources/Frameworks'" "-framework UIKit" diff --git a/Natives/JavaLauncher.c b/Natives/JavaLauncher.m similarity index 100% rename from Natives/JavaLauncher.c rename to Natives/JavaLauncher.m diff --git a/Natives/egl_bridge.c b/Natives/egl_bridge.m similarity index 100% rename from Natives/egl_bridge.c rename to Natives/egl_bridge.m diff --git a/Natives/input_bridge_v3.c b/Natives/input_bridge_v3.m similarity index 100% rename from Natives/input_bridge_v3.c rename to Natives/input_bridge_v3.m diff --git a/Natives/main.c b/Natives/main.m similarity index 100% rename from Natives/main.c rename to Natives/main.m diff --git a/Natives/utils.c b/Natives/utils.m similarity index 100% rename from Natives/utils.c rename to Natives/utils.m