Fix C-Make and Scons builds

wesnoth · Oct 30, 2018 · ca7f7a2 · ca7f7a2
1 parent ac4dbfd
commit ca7f7a2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/SConstruct b/SConstruct
@@ -622,6 +622,7 @@ for env in [test_env, client_env, env]:
     if env["PLATFORM"] == 'darwin':            # Mac OS X
         env.Append(FRAMEWORKS = "Cocoa")            # Cocoa GUI
         env.Append(FRAMEWORKS = "Security")         # commonCrypto (after OpenSSL replacement on Mac)
+        env.Append(FRAMEWORKS = "IOKit")            # IOKit
 
 if not env['static_test']:
     test_env.Append(CPPDEFINES = "BOOST_TEST_DYN_LINK")

diff --git a/source_lists/wesnoth b/source_lists/wesnoth
@@ -67,6 +67,7 @@ commandline_options.cpp
 config_cache.cpp
 controller_base.cpp
 countdown_clock.cpp
+desktop/battery_info.cpp
 desktop/notifications.cpp
 desktop/open.cpp
 desktop/paths.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -268,6 +268,7 @@ endif(WIN32)
 if(APPLE)
 	set(libwesnoth-game_STAT_SRC
 		${libwesnoth-game_STAT_SRC}
+		desktop/apple_battery_info.mm
 		desktop/apple_notification.mm
 		desktop/apple_version.mm
 	)

diff --git a/src/SConscript b/src/SConscript
@@ -89,6 +89,7 @@ if env["PLATFORM"] == "win32":
     wesnoth_client_sources.append("desktop/windows_tray_notification.cpp")
 
 if env["PLATFORM"] == 'darwin':
+    wesnoth_client_sources.append("desktop/apple_battery_info.mm")
     wesnoth_client_sources.append("desktop/apple_notification.mm")
     wesnoth_client_sources.append("desktop/apple_version.mm")
 

diff --git a/src/desktop/apple_battery_info.mm b/src/desktop/apple_battery_info.mm
@@ -76,7 +76,7 @@ bool does_device_have_battery() {
     CFRelease(list);
     CFRelease(info);
 
-    return (NSDictionary*) battery;
+    return static_cast<NSDictionary*>(battery);
 }
 #endif