From 6aa9bd0f77dcb5128167fae62e32aa5252fe85c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 2 Dec 2013 00:55:24 +0100
Subject: Renew the updater branch

Now with some actual consensus on what the updater will do!
---
 mmc_updater/CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 mmc_updater/CMakeLists.txt

(limited to 'mmc_updater/CMakeLists.txt')

diff --git a/mmc_updater/CMakeLists.txt b/mmc_updater/CMakeLists.txt
new file mode 100644
index 00000000..ef4b096d
--- /dev/null
+++ b/mmc_updater/CMakeLists.txt
@@ -0,0 +1,44 @@
+project(updater)
+
+cmake_minimum_required(VERSION 2.6)
+enable_testing()
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+
+include_directories(depends)
+
+if (WIN32)
+    include_directories(depends/win32cpp/include)
+
+    if(MSVC)
+		# - Link the updater binary statically with the Visual C++ runtime
+		#   so that the executable can function standalone.
+		# - Enable PDB generation for release builds
+		set(CMAKE_CXX_FLAGS_DEBUG "/MT")
+		set(CMAKE_C_FLAGS_DEBUG "/MT")
+
+		set(CMAKE_CXX_FLAGS_RELEASE "/MT /Zi /O2 /Ob2 /D NDEBUG")
+		set(CMAKE_C_FLAGS_RELEASE "/MT /Zi /O2 /Ob2 /D NDEBUG")
+		remove_definitions(-DUNICODE -D_UNICODE)
+    endif()
+else()
+	# optimize for reduced code size
+	set(CMAKE_CXX_FLAGS_RELEASE "-Os")
+	set(CMAKE_C_FLAGS_RELEASE "-Os")
+endif()
+
+if (APPLE)
+	# Build the updater as a dual 32/64bit binary.  If only one architecture
+	# is required, removing the other architecture will reduce the size
+	# of the updater binary
+	set(CMAKE_OSX_ARCHITECTURES i386;x86_64)
+
+	# Build the updater so that it works on OS X 10.5 and above.
+	set(MIN_OSX_VERSION 10.5)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${MIN_OSX_VERSION}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${MIN_OSX_VERSION}")
+endif()
+
+add_subdirectory(src)
+add_subdirectory(depends/AnyOption)
+add_subdirectory(depends/tinyxml)
+
-- 
cgit v1.2.3


From 858916b951e92127c22503826b746d1e70c433f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 7 Dec 2013 03:51:21 +0100
Subject: Fix build failures on Windows.

* remove atoll
* fix include path of updater depends
---
 mmc_updater/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mmc_updater/CMakeLists.txt')

diff --git a/mmc_updater/CMakeLists.txt b/mmc_updater/CMakeLists.txt
index ef4b096d..61c8cd09 100644
--- a/mmc_updater/CMakeLists.txt
+++ b/mmc_updater/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 include_directories(depends)
 
 if (WIN32)
-    include_directories(depends/win32cpp/include)
+    include_directories(depends/win32cpp)
 
     if(MSVC)
 		# - Link the updater binary statically with the Visual C++ runtime
-- 
cgit v1.2.3