diff --git a/bin/BridgeCommand.app/Contents/MacOS/bc.app/Contents/Info.plist b/bin/BridgeCommand.app/Contents/Helpers/bc.app/Contents/Info.plist similarity index 97% rename from bin/BridgeCommand.app/Contents/MacOS/bc.app/Contents/Info.plist rename to bin/BridgeCommand.app/Contents/Helpers/bc.app/Contents/Info.plist index 3bad3fef7..6ee36b298 100644 --- a/bin/BridgeCommand.app/Contents/MacOS/bc.app/Contents/Info.plist +++ b/bin/BridgeCommand.app/Contents/Helpers/bc.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleIdentifier uk.co.bridgecommand.bc LSMinimumSystemVersion - 10.7.0 + 10.13.0 LSApplicationCategoryType public.app-category.simulation-games CFBundleName diff --git a/bin/BridgeCommand.app/Contents/MacOS/bc.app/Contents/MacOS/.gitignore b/bin/BridgeCommand.app/Contents/Helpers/bc.app/Contents/MacOS/.gitignore similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/bc.app/Contents/MacOS/.gitignore rename to bin/BridgeCommand.app/Contents/Helpers/bc.app/Contents/MacOS/.gitignore diff --git a/bin/BridgeCommand.app/Contents/MacOS/bc.app/Contents/PkgInfo b/bin/BridgeCommand.app/Contents/Helpers/bc.app/Contents/PkgInfo similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/bc.app/Contents/PkgInfo rename to bin/BridgeCommand.app/Contents/Helpers/bc.app/Contents/PkgInfo diff --git a/bin/BridgeCommand.app/Contents/MacOS/ed.app/Contents/Info.plist b/bin/BridgeCommand.app/Contents/Helpers/ed.app/Contents/Info.plist similarity index 97% rename from bin/BridgeCommand.app/Contents/MacOS/ed.app/Contents/Info.plist rename to bin/BridgeCommand.app/Contents/Helpers/ed.app/Contents/Info.plist index 5d8155464..4bd329bf1 100644 --- a/bin/BridgeCommand.app/Contents/MacOS/ed.app/Contents/Info.plist +++ b/bin/BridgeCommand.app/Contents/Helpers/ed.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleIdentifier uk.co.bridgecommand.ed LSMinimumSystemVersion - 10.7.0 + 10.13.0 LSApplicationCategoryType public.app-category.simulation-games CFBundleName diff --git a/bin/BridgeCommand.app/Contents/MacOS/ed.app/Contents/MacOS/.gitignore b/bin/BridgeCommand.app/Contents/Helpers/ed.app/Contents/MacOS/.gitignore similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/ed.app/Contents/MacOS/.gitignore rename to bin/BridgeCommand.app/Contents/Helpers/ed.app/Contents/MacOS/.gitignore diff --git a/bin/BridgeCommand.app/Contents/MacOS/ed.app/Contents/PkgInfo b/bin/BridgeCommand.app/Contents/Helpers/ed.app/Contents/PkgInfo similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/ed.app/Contents/PkgInfo rename to bin/BridgeCommand.app/Contents/Helpers/ed.app/Contents/PkgInfo diff --git a/bin/BridgeCommand.app/Contents/MacOS/ini.app/Contents/Info.plist b/bin/BridgeCommand.app/Contents/Helpers/ini.app/Contents/Info.plist similarity index 97% rename from bin/BridgeCommand.app/Contents/MacOS/ini.app/Contents/Info.plist rename to bin/BridgeCommand.app/Contents/Helpers/ini.app/Contents/Info.plist index 2addbd939..f6f7cc055 100644 --- a/bin/BridgeCommand.app/Contents/MacOS/ini.app/Contents/Info.plist +++ b/bin/BridgeCommand.app/Contents/Helpers/ini.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleIdentifier uk.co.bridgecommand.ini LSMinimumSystemVersion - 10.7.0 + 10.13.0 LSApplicationCategoryType public.app-category.simulation-games CFBundleName diff --git a/bin/BridgeCommand.app/Contents/MacOS/ini.app/Contents/MacOS/.gitignore b/bin/BridgeCommand.app/Contents/Helpers/ini.app/Contents/MacOS/.gitignore similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/ini.app/Contents/MacOS/.gitignore rename to bin/BridgeCommand.app/Contents/Helpers/ini.app/Contents/MacOS/.gitignore diff --git a/bin/BridgeCommand.app/Contents/MacOS/ini.app/Contents/PkgInfo b/bin/BridgeCommand.app/Contents/Helpers/ini.app/Contents/PkgInfo similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/ini.app/Contents/PkgInfo rename to bin/BridgeCommand.app/Contents/Helpers/ini.app/Contents/PkgInfo diff --git a/bin/BridgeCommand.app/Contents/MacOS/mc.app/Contents/Info.plist b/bin/BridgeCommand.app/Contents/Helpers/mc.app/Contents/Info.plist similarity index 97% rename from bin/BridgeCommand.app/Contents/MacOS/mc.app/Contents/Info.plist rename to bin/BridgeCommand.app/Contents/Helpers/mc.app/Contents/Info.plist index 0be28be1e..25fa9d810 100644 --- a/bin/BridgeCommand.app/Contents/MacOS/mc.app/Contents/Info.plist +++ b/bin/BridgeCommand.app/Contents/Helpers/mc.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleIdentifier uk.co.bridgecommand.mc LSMinimumSystemVersion - 10.7.0 + 10.13.0 LSApplicationCategoryType public.app-category.simulation-games CFBundleName diff --git a/bin/BridgeCommand.app/Contents/MacOS/mc.app/Contents/MacOS/.gitignore b/bin/BridgeCommand.app/Contents/Helpers/mc.app/Contents/MacOS/.gitignore similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/mc.app/Contents/MacOS/.gitignore rename to bin/BridgeCommand.app/Contents/Helpers/mc.app/Contents/MacOS/.gitignore diff --git a/bin/BridgeCommand.app/Contents/MacOS/mc.app/Contents/PkgInfo b/bin/BridgeCommand.app/Contents/Helpers/mc.app/Contents/PkgInfo similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/mc.app/Contents/PkgInfo rename to bin/BridgeCommand.app/Contents/Helpers/mc.app/Contents/PkgInfo diff --git a/bin/BridgeCommand.app/Contents/MacOS/mh.app/Contents/Info.plist b/bin/BridgeCommand.app/Contents/Helpers/mh.app/Contents/Info.plist similarity index 97% rename from bin/BridgeCommand.app/Contents/MacOS/mh.app/Contents/Info.plist rename to bin/BridgeCommand.app/Contents/Helpers/mh.app/Contents/Info.plist index 07457b49e..254736b1a 100644 --- a/bin/BridgeCommand.app/Contents/MacOS/mh.app/Contents/Info.plist +++ b/bin/BridgeCommand.app/Contents/Helpers/mh.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleIdentifier uk.co.bridgecommand.mh LSMinimumSystemVersion - 10.7.0 + 10.13.0 LSApplicationCategoryType public.app-category.simulation-games CFBundleName diff --git a/bin/BridgeCommand.app/Contents/MacOS/mh.app/Contents/MacOS/.gitignore b/bin/BridgeCommand.app/Contents/Helpers/mh.app/Contents/MacOS/.gitignore similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/mh.app/Contents/MacOS/.gitignore rename to bin/BridgeCommand.app/Contents/Helpers/mh.app/Contents/MacOS/.gitignore diff --git a/bin/BridgeCommand.app/Contents/MacOS/mh.app/Contents/PkgInfo b/bin/BridgeCommand.app/Contents/Helpers/mh.app/Contents/PkgInfo similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/mh.app/Contents/PkgInfo rename to bin/BridgeCommand.app/Contents/Helpers/mh.app/Contents/PkgInfo diff --git a/bin/BridgeCommand.app/Contents/MacOS/rp.app/Contents/Info.plist b/bin/BridgeCommand.app/Contents/Helpers/rp.app/Contents/Info.plist similarity index 97% rename from bin/BridgeCommand.app/Contents/MacOS/rp.app/Contents/Info.plist rename to bin/BridgeCommand.app/Contents/Helpers/rp.app/Contents/Info.plist index 2269d0c38..fff967ea3 100644 --- a/bin/BridgeCommand.app/Contents/MacOS/rp.app/Contents/Info.plist +++ b/bin/BridgeCommand.app/Contents/Helpers/rp.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleIdentifier uk.co.bridgecommand.rp LSMinimumSystemVersion - 10.7.0 + 10.13.0 LSApplicationCategoryType public.app-category.simulation-games CFBundleName diff --git a/bin/BridgeCommand.app/Contents/MacOS/rp.app/Contents/MacOS/.gitignore b/bin/BridgeCommand.app/Contents/Helpers/rp.app/Contents/MacOS/.gitignore similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/rp.app/Contents/MacOS/.gitignore rename to bin/BridgeCommand.app/Contents/Helpers/rp.app/Contents/MacOS/.gitignore diff --git a/bin/BridgeCommand.app/Contents/MacOS/rp.app/Contents/PkgInfo b/bin/BridgeCommand.app/Contents/Helpers/rp.app/Contents/PkgInfo similarity index 100% rename from bin/BridgeCommand.app/Contents/MacOS/rp.app/Contents/PkgInfo rename to bin/BridgeCommand.app/Contents/Helpers/rp.app/Contents/PkgInfo diff --git a/bin/BridgeCommand.app/Contents/Info.plist b/bin/BridgeCommand.app/Contents/Info.plist index 5246ef553..7fcfae5d1 100644 --- a/bin/BridgeCommand.app/Contents/Info.plist +++ b/bin/BridgeCommand.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleIdentifier uk.co.bridgecommand.BridgeCommand LSMinimumSystemVersion - 10.7.0 + 10.13.0 LSApplicationCategoryType public.app-category.simulation-games CFBundleName diff --git a/bin/macOScopy b/bin/macOScopy index 79bdee075..291fa390e 100755 --- a/bin/macOScopy +++ b/bin/macOScopy @@ -1,19 +1,19 @@ #!/bin/sh cp bridgecommand BridgeCommand.app/Contents/MacOS/BridgeCommand -cp bridgecommand-bc BridgeCommand.app/Contents/MacOS/bc.app/Contents/MacOS/bc -cp bridgecommand-mc BridgeCommand.app/Contents/MacOS/mc.app/Contents/MacOS/mc -cp bridgecommand-ed BridgeCommand.app/Contents/MacOS/ed.app/Contents/MacOS/ed -cp bridgecommand-ini BridgeCommand.app/Contents/MacOS/ini.app/Contents/MacOS/ini -cp bridgecommand-mh BridgeCommand.app/Contents/MacOS/mh.app/Contents/MacOS/mh -cp bridgecommand-rp BridgeCommand.app/Contents/MacOS/rp.app/Contents/MacOS/rp +cp bridgecommand-bc BridgeCommand.app/Contents/Helpers/bc.app/Contents/MacOS/bc +cp bridgecommand-mc BridgeCommand.app/Contents/Helpers/mc.app/Contents/MacOS/mc +cp bridgecommand-ed BridgeCommand.app/Contents/Helpers/ed.app/Contents/MacOS/ed +cp bridgecommand-ini BridgeCommand.app/Contents/Helpers/ini.app/Contents/MacOS/ini +cp bridgecommand-mh BridgeCommand.app/Contents/Helpers/mh.app/Contents/MacOS/mh +cp bridgecommand-rp BridgeCommand.app/Contents/Helpers/rp.app/Contents/MacOS/rp -rm -f BridgeCommand.app/Contents/MacOS/bc.app/Contents/MacOS/.gitignore -rm -f BridgeCommand.app/Contents/MacOS/mc.app/Contents/MacOS/.gitignore -rm -f BridgeCommand.app/Contents/MacOS/ed.app/Contents/MacOS/.gitignore -rm -f BridgeCommand.app/Contents/MacOS/ini.app/Contents/MacOS/.gitignore -rm -f BridgeCommand.app/Contents/MacOS/mh.app/Contents/MacOS/.gitignore -rm -f BridgeCommand.app/Contents/MacOS/rp.app/Contents/MacOS/.gitignore +rm -f BridgeCommand.app/Helpers/MacOS/bc.app/Contents/MacOS/.gitignore +rm -f BridgeCommand.app/Helpers/MacOS/mc.app/Contents/MacOS/.gitignore +rm -f BridgeCommand.app/Helpers/MacOS/ed.app/Contents/MacOS/.gitignore +rm -f BridgeCommand.app/Helpers/MacOS/ini.app/Contents/MacOS/.gitignore +rm -f BridgeCommand.app/Helpers/MacOS/mh.app/Contents/MacOS/.gitignore +rm -f BridgeCommand.app/Helpers/MacOS/rp.app/Contents/MacOS/.gitignore rm -f BridgeCommand.app/Contents/MacOS/.gitignore rm -rf BridgeCommand.app/Contents/Resources/doc rm -rf BridgeCommand.app/Contents/Resources/media diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 28f154466..a403446ab 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,8 +9,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if (APPLE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.7") - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.13") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") + set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") endif (APPLE) add_subdirectory(libs/asio) diff --git a/src/launcher/main.cpp b/src/launcher/main.cpp index a43a0c505..3bd375c28 100644 --- a/src/launcher/main.cpp +++ b/src/launcher/main.cpp @@ -87,7 +87,7 @@ class Receiver : public irr::IEventReceiver #else #ifdef __APPLE__ //APPLE - execl("../MacOS/bc.app/Contents/MacOS/bc", "bc", NULL); + execl("../Helpers/bc.app/Contents/MacOS/bc", "bc", NULL); #else //Other (assumed posix) execl("./bridgecommand-bc", "bridgecommand-bc", NULL); @@ -101,7 +101,7 @@ class Receiver : public irr::IEventReceiver #else #ifdef __APPLE__ //APPLE - execl("../MacOS/mc.app/Contents/MacOS/mc", "mc", NULL); + execl("../Helpers/mc.app/Contents/MacOS/mc", "mc", NULL); #else //Other (assumed posix) execl("./bridgecommand-mc", "bridgecommand-mc", NULL); @@ -115,7 +115,7 @@ class Receiver : public irr::IEventReceiver #else #ifdef __APPLE__ //APPLE - execl("../MacOS/rp.app/Contents/MacOS/rp", "rp", NULL); + execl("../Helpers/rp.app/Contents/MacOS/rp", "rp", NULL); #else //Other (assumed posix) execl("./bridgecommand-rp", "bridgecommand-rp", NULL); @@ -129,7 +129,7 @@ class Receiver : public irr::IEventReceiver #else #ifdef __APPLE__ //APPLE - execl("../MacOS/ed.app/Contents/MacOS/ed", "ed", NULL); + execl("../Helpers/ed.app/Contents/MacOS/ed", "ed", NULL); #else //Other (assumed posix) execl("./bridgecommand-ed", "bridgecommand-ed", NULL); @@ -143,7 +143,7 @@ class Receiver : public irr::IEventReceiver #else #ifdef __APPLE__ //APPLE - execl("../MacOS/mh.app/Contents/MacOS/mh", "mh", NULL); + execl("../Helpers/mh.app/Contents/MacOS/mh", "mh", NULL); #else //Other (assumed posix) execl("./bridgecommand-mh", "bridgecommand-mh", NULL); @@ -157,7 +157,7 @@ class Receiver : public irr::IEventReceiver #else #ifdef __APPLE__ //APPLE - execl("../MacOS/ini.app/Contents/MacOS/ini", "ini", NULL); + execl("../Helpers/ini.app/Contents/MacOS/ini", "ini", NULL); #else //Other (assumed posix) execl("./bridgecommand-ini", "bridgecommand-ini", NULL); @@ -171,7 +171,7 @@ class Receiver : public irr::IEventReceiver #else #ifdef __APPLE__ //APPLE - execl("../MacOS/ini.app/Contents/MacOS/ini", "ini", "-M", NULL); + execl("../Helpers/ini.app/Contents/MacOS/ini", "ini", "-M", NULL); #else //Other (assumed posix) execl("./bridgecommand-ini", "bridgecommand-ini", "-M", NULL); @@ -185,7 +185,7 @@ class Receiver : public irr::IEventReceiver #else #ifdef __APPLE__ //APPLE - execl("../MacOS/ini.app/Contents/MacOS/ini", "ini", "-R", NULL); + execl("../Helpers/ini.app/Contents/MacOS/ini", "ini", "-R", NULL); #else //Other (assumed posix) execl("./bridgecommand-ini", "bridgecommand-ini", "-R", NULL); @@ -199,7 +199,7 @@ class Receiver : public irr::IEventReceiver #else #ifdef __APPLE__ //APPLE - execl("../MacOS/ini.app/Contents/MacOS/ini", "ini", "-H", NULL); + execl("../Helpers/ini.app/Contents/MacOS/ini", "ini", "-H", NULL); #else //Other (assumed posix) execl("./bridgecommand-ini", "bridgecommand-ini", "-H", NULL); diff --git a/src/libs/Irrlicht/changesForBC.txt b/src/libs/Irrlicht/changesForBC.txt index b49434012..2f1ddba9f 100644 --- a/src/libs/Irrlicht/changesForBC.txt +++ b/src/libs/Irrlicht/changesForBC.txt @@ -38,6 +38,16 @@ CIrrDeviceOSX.mm: -:ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0; +:ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSCommandKeyMask) != 0; //JAMES +At windowWillResize, comment out lines: +- if (Device->isResizable()) +- return proposedFrameSize; +- else ++ // JAMES: Force not to be resizeable. This seemed to be causing a crash at startup (race condition?) ++ //if (Device->isResizable()) ++ // return proposedFrameSize; ++ //else + + CIrrDeviceWin32.cpp: Below activeJoystick.axisValid[5]= (info.lRz!=0) ? 1 : 0; +:activeJoystick.axisValid[6] = (info.rglSlider[0] != 0) ? 1 : 0; //JAMES diff --git a/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/CIrrDeviceOSX.mm b/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/CIrrDeviceOSX.mm index 8394bc47e..1815cabf7 100644 --- a/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/CIrrDeviceOSX.mm +++ b/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/CIrrDeviceOSX.mm @@ -531,9 +531,10 @@ - (void)windowWillClose:(id)sender - (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize { - if (Device->isResizable()) - return proposedFrameSize; - else + // JAMES: Force not to be resizeable. This seemed to be causing a crash at startup (race condition?) + //if (Device->isResizable()) + // return proposedFrameSize; + //else return [window frame].size; } diff --git a/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj b/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj index dc44ee8fc..6296b2eb1 100644 --- a/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj +++ b/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj @@ -2493,7 +2493,7 @@ "PNG_ARM_NEON_OPT=0", ); INSTALL_PATH = /; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -2513,7 +2513,7 @@ "PNG_ARM_NEON_OPT=0", ); INSTALL_PATH = /; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-U__STRICT_ANSI__", @@ -2548,7 +2548,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = Irrlicht; @@ -2582,7 +2582,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = Irrlicht; SDKROOT = macosx; diff --git a/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/libpng/pngpriv.h b/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/libpng/pngpriv.h index 7018f3dba..2a5b42343 100644 --- a/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/libpng/pngpriv.h +++ b/src/libs/Irrlicht/irrlicht-svn/source/Irrlicht/libpng/pngpriv.h @@ -524,7 +524,7 @@ * if possible. */ # if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__) -# include +# include # endif # else # include diff --git a/src/libs/enet-1.3.14/CMakeLists.txt b/src/libs/enet-1.3.14/CMakeLists.txt index d3d4aa8de..bd5f9c204 100644 --- a/src/libs/enet-1.3.14/CMakeLists.txt +++ b/src/libs/enet-1.3.14/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.5) project(enet)