mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-29 19:48:53 +02:00
63 lines
1.8 KiB
Plaintext
63 lines
1.8 KiB
Plaintext
From a95b718590cf9123a8ceea21ce49102abcd9c98b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Mon, 25 Dec 2017 22:08:42 +0100
|
|
Subject: Haiku build fix
|
|
|
|
|
|
diff --git a/ImageLounge/CMakeLists.txt b/ImageLounge/CMakeLists.txt
|
|
index fdcd694..72874ad 100644
|
|
--- a/ImageLounge/CMakeLists.txt
|
|
+++ b/ImageLounge/CMakeLists.txt
|
|
@@ -101,7 +101,11 @@ endif()
|
|
|
|
if (ENABLE_CODE_COV AND CMAKE_COMPILER_IS_GNUCXX)
|
|
# Codecov
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage")
|
|
+ if (HAIKU)
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -g -O0 -fprofile-arcs -ftest-coverage -lexpat")
|
|
+ else()
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage")
|
|
+ endif()
|
|
endif()
|
|
|
|
# find Qt
|
|
--
|
|
2.24.0
|
|
|
|
|
|
From 53cacb2039fe88cc76e8a200d9cdb9795ab54c78 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Tue, 19 Nov 2019 17:30:30 +0100
|
|
Subject: include iostream.
|
|
|
|
|
|
diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
|
|
index d195757..affec7b 100644
|
|
--- a/ImageLounge/src/DkCore/DkMetaData.cpp
|
|
+++ b/ImageLounge/src/DkCore/DkMetaData.cpp
|
|
@@ -42,6 +42,8 @@
|
|
#include <QApplication>
|
|
#pragma warning(pop) // no warnings from includes - end
|
|
|
|
+#include <iostream>
|
|
+
|
|
namespace nmc {
|
|
|
|
// DkMetaDataT --------------------------------------------------------------------
|
|
diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp
|
|
index 6a412f7..bbfba23 100644
|
|
--- a/ImageLounge/src/DkGui/DkNoMacs.cpp
|
|
+++ b/ImageLounge/src/DkGui/DkNoMacs.cpp
|
|
@@ -96,6 +96,8 @@
|
|
#include <QWinTaskbarButton>
|
|
#endif
|
|
|
|
+#include <iostream>
|
|
+
|
|
namespace nmc {
|
|
|
|
DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
|
|
--
|
|
2.24.0
|
|
|