Kaynağa Gözat

some random cleanup

Andrey Filipenkov 4 yıl önce
ebeveyn
işleme
59fe73e454
3 değiştirilmiş dosya ile 3 ekleme ve 2 silme
  1. 1 0
      .gitignore
  2. 1 1
      CMakeLists.txt
  3. 1 1
      client/CMT.cpp

+ 1 - 0
.gitignore

@@ -39,6 +39,7 @@ doc/*
 VCMI_VS11.sdf
 VCMI_VS11.sdf
 *.ipch
 *.ipch
 VCMI_VS11.opensdf
 VCMI_VS11.opensdf
+.DS_Store
 
 
 # Visual Studio
 # Visual Studio
 *.suo
 *.suo

+ 1 - 1
CMakeLists.txt

@@ -58,7 +58,7 @@ endif()
 option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF)
 option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF)
 option(ENABLE_LUA "Enable compilation of LUA scripting module" OFF)
 option(ENABLE_LUA "Enable compilation of LUA scripting module" OFF)
 if(APPLE_IOS)
 if(APPLE_IOS)
-	set(BUNDLE_IDENTIFIER_PREFIX "eu.vcmi" CACHE STRING "Bundle identifier prefix")
+	set(BUNDLE_IDENTIFIER_PREFIX "" CACHE STRING "Bundle identifier prefix")
 else()
 else()
 	option(ENABLE_LAUNCHER "Enable compilation of launcher" ON)
 	option(ENABLE_LAUNCHER "Enable compilation of launcher" ON)
 	option(ENABLE_TEST "Enable compilation of unit tests" ON)
 	option(ENABLE_TEST "Enable compilation of unit tests" ON)

+ 1 - 1
client/CMT.cpp

@@ -410,7 +410,7 @@ int main(int argc, char * argv[])
 		CCS->musich->setVolume((ui32)settings["general"]["music"].Float());
 		CCS->musich->setVolume((ui32)settings["general"]["music"].Float());
 		logGlobal->info("Initializing screen and sound handling: %d ms", pomtime.getDiff());
 		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
 	// Ctrl+click should be treated as a right click on Mac OS X
 	SDL_SetHint(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, "1");
 	SDL_SetHint(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, "1");
 #endif
 #endif