diff --git a/.gitignore b/.gitignore index fb947fc5c..3cc5ecc37 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ doc/* VCMI_VS11.sdf *.ipch VCMI_VS11.opensdf +.DS_Store # Visual Studio *.suo diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ba91a18c..9217ccf22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ endif() option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF) option(ENABLE_LUA "Enable compilation of LUA scripting module" OFF) if(APPLE_IOS) - set(BUNDLE_IDENTIFIER_PREFIX "eu.vcmi" CACHE STRING "Bundle identifier prefix") + set(BUNDLE_IDENTIFIER_PREFIX "" CACHE STRING "Bundle identifier prefix") else() option(ENABLE_LAUNCHER "Enable compilation of launcher" ON) option(ENABLE_TEST "Enable compilation of unit tests" ON) diff --git a/client/CMT.cpp b/client/CMT.cpp index cdd1408de..117985985 100644 --- a/client/CMT.cpp +++ b/client/CMT.cpp @@ -410,7 +410,7 @@ int main(int argc, char * argv[]) CCS->musich->setVolume((ui32)settings["general"]["music"].Float()); logGlobal->info("Initializing screen and sound handling: %d ms", pomtime.getDiff()); } -#ifdef __APPLE__ +#ifdef VCMI_MAC // Ctrl+click should be treated as a right click on Mac OS X SDL_SetHint(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, "1"); #endif