Skip to content
Permalink
Browse files

Fixed qtzeroconf compilation on Win10 with MinGW (#326)

- Fixed DEFINES in remote.pro to not override defines of qtzeroconf
- Additional include for MinGW in CommonServices.h
- Fixed missing returns for MSVC compiler

This fixes #326
  • Loading branch information
zehnm committed Nov 3, 2019
1 parent 90655ce commit b8c2b0918af6896ee555f5bd357aa5f6c3c1f79c
@@ -247,6 +247,10 @@ extern "C" {
#define WIN32_LEAN_AND_MEAN // Needed to avoid redefinitions by Windows interfaces.
#endif

#if ( defined( __MINGW32__ ) )
#include <stdint.h>
#endif

#if ( defined( __MWERKS__ ) )

#if ( __option( c9x ) )
@@ -120,7 +120,7 @@ TRANSLATIONS = translations/bg_BG.ts \

# include zeroconf
include(qtzeroconf/qtzeroconf.pri)
DEFINES = QZEROCONF_STATIC
DEFINES += QZEROCONF_STATIC

# Wiringpi config, only on raspberry pi
equals(QT_ARCH, arm): {
@@ -145,8 +145,6 @@ RCC_DIR = $$PWD/build/$$DESTINATION_PATH/qrc
UI_DIR = $$PWD/build/$$DESTINATION_PATH/ui

win32 {
message(Handling win32 specific configuration)

# copy plugin files
CONFIG += file_copies

@@ -160,18 +158,11 @@ win32 {
icons.files = $$files($$PWD/icons/*.*)
icons.path = $$DESTDIR/icons
} else:linux {
message(Handling 'linux' configuration)

CONFIG += file_copies
COPIES += extraData
extraData.files = $$PWD/config.json $$PWD/translations.json
extraData.path = $$DESTDIR

# copy plugin files
#COPIES += plugins
#plugins.files = $$files($$PWD/plugins/*.*)
#plugins.path = $$DESTDIR/plugins

#copy fonts
COPIES += fonts
fonts.files = $$files($$PWD/fonts/*.*)
@@ -182,8 +173,6 @@ win32 {
icons.files = $$files($$PWD/icons/*.*)
icons.path = $$DESTDIR/icons
} else:macx {
message(Handling macOS specific configuration)

APP_QML_FILES.files = $$PWD/config.json $$PWD/translations.json
APP_QML_FILES.path = Contents/Resources
QMAKE_BUNDLE_DATA += APP_QML_FILES
@@ -63,6 +63,7 @@ QVariantMap Entity::getDataToSave()

bool Entity::update(const QVariantMap &attributes)
{
return false;
}

void Entity::setFavorite(bool value)
@@ -7,6 +7,7 @@ QString Remote::Type = "remote";

bool Remote::update(const QVariantMap &attributes)
{
return false;
}

// transport and media controls
@@ -1,6 +1,7 @@
#include "drv2605.h"
#include "../notifications.h"

// FIXME use strategy pattern for architecture specific device driver instead of multiple #ifdef __arm__
drv2605::drv2605()
{
#ifdef __arm__
@@ -64,6 +65,7 @@ bool drv2605::init()

return true;
#endif
return false;
}
#ifdef __arm__
void drv2605::setWaveform(uint8_t slot, uint8_t w)

0 comments on commit b8c2b09

Please sign in to comment.
You can’t perform that action at this time.