From 39b48f2357b0b783815be88031b738376fa228e0 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Thu, 19 Feb 2015 02:51:00 +1100
Subject: Upgrade Heimdall Frontend to Qt5 and build with cmake

---
 heimdall-frontend/CMakeLists.txt | 48 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 heimdall-frontend/CMakeLists.txt

(limited to 'heimdall-frontend/CMakeLists.txt')

diff --git a/heimdall-frontend/CMakeLists.txt b/heimdall-frontend/CMakeLists.txt
new file mode 100644
index 0000000..a21db5a
--- /dev/null
+++ b/heimdall-frontend/CMakeLists.txt
@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 2.8.4)
+
+project(heimdall-frontend)
+
+set(LIBPIT_INCLUDE_DIRS
+    ../libpit/Source)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON) # moc files are generated in build (current) directory
+
+find_package(Qt5Widgets REQUIRED)
+find_package(ZLIB REQUIRED)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
+
+include_directories(${LIBPIT_INCLUDE_DIRS})
+
+set(HEIMDALL_FRONTEND_SOURCE_FILES
+    Source/aboutform.cpp
+    Source/Alerts.cpp
+    Source/FirmwareInfo.cpp
+    Source/main.cpp
+    Source/mainwindow.cpp
+    Source/PackageData.cpp
+    Source/Packaging.cpp)
+
+qt5_wrap_ui(HEIMDALL_FRONTEND_FORMS
+    mainwindow.ui
+    aboutform.ui)
+
+qt5_add_resources(HEIMDALL_FRONTEND_RESOURCES
+    mainwindow.qrc)
+
+add_executable(heimdall-frontend WIN32
+    ${HEIMDALL_FRONTEND_SOURCE_FILES}
+    ${HEIMDALL_FRONTEND_FORMS}
+    ${HEIMDALL_FRONTEND_RESOURCES})
+
+include(LargeFiles)
+use_large_files(heimdall-frontend YES)
+
+set_property(TARGET heimdall-frontend
+    APPEND PROPERTY COMPILE_DEFINITIONS "QT_LARGEFILE_SUPPORT")
+
+target_link_libraries(heimdall-frontend pit)
+target_link_libraries(heimdall-frontend Qt5::Widgets)
+target_link_libraries(heimdall-frontend z)
-- 
cgit v1.1


From b22ae7b89f7993f632e10e18c116f293f314575f Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Thu, 19 Feb 2015 03:13:56 +1100
Subject: Removed autotools and VS files, and standardised source dir naming

---
 heimdall-frontend/CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'heimdall-frontend/CMakeLists.txt')

diff --git a/heimdall-frontend/CMakeLists.txt b/heimdall-frontend/CMakeLists.txt
index a21db5a..76dac2e 100644
--- a/heimdall-frontend/CMakeLists.txt
+++ b/heimdall-frontend/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.4)
 project(heimdall-frontend)
 
 set(LIBPIT_INCLUDE_DIRS
-    ../libpit/Source)
+    ../libpit/source)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON) # moc files are generated in build (current) directory
@@ -17,13 +17,13 @@ set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
 include_directories(${LIBPIT_INCLUDE_DIRS})
 
 set(HEIMDALL_FRONTEND_SOURCE_FILES
-    Source/aboutform.cpp
-    Source/Alerts.cpp
-    Source/FirmwareInfo.cpp
-    Source/main.cpp
-    Source/mainwindow.cpp
-    Source/PackageData.cpp
-    Source/Packaging.cpp)
+    source/aboutform.cpp
+    source/Alerts.cpp
+    source/FirmwareInfo.cpp
+    source/main.cpp
+    source/mainwindow.cpp
+    source/PackageData.cpp
+    source/Packaging.cpp)
 
 qt5_wrap_ui(HEIMDALL_FRONTEND_FORMS
     mainwindow.ui
-- 
cgit v1.1


From 67c17cc48bc3a2914d8e6ecb39ec1fb54b4806aa Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Thu, 19 Feb 2015 05:08:26 +1100
Subject: Fix Unix build issues and work-around Qt5 Mac UI bugs

---
 heimdall-frontend/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'heimdall-frontend/CMakeLists.txt')

diff --git a/heimdall-frontend/CMakeLists.txt b/heimdall-frontend/CMakeLists.txt
index 76dac2e..95889b3 100644
--- a/heimdall-frontend/CMakeLists.txt
+++ b/heimdall-frontend/CMakeLists.txt
@@ -12,7 +12,10 @@ find_package(Qt5Widgets REQUIRED)
 find_package(ZLIB REQUIRED)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
+
+if(MINGW)
+    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
+endif(MINGW)
 
 include_directories(${LIBPIT_INCLUDE_DIRS})
 
@@ -33,6 +36,7 @@ qt5_add_resources(HEIMDALL_FRONTEND_RESOURCES
     mainwindow.qrc)
 
 add_executable(heimdall-frontend WIN32
+    MACOSX_BUNDLE
     ${HEIMDALL_FRONTEND_SOURCE_FILES}
     ${HEIMDALL_FRONTEND_FORMS}
     ${HEIMDALL_FRONTEND_RESOURCES})
-- 
cgit v1.1