From ba8600a6c361bfc60531a2c90ae67e9268e7f939 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Thu, 15 May 2014 00:59:47 +1000 Subject: Fixed Heimdall Frontend Mac builds. --- heimdall-frontend/heimdall-frontend.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'heimdall-frontend/heimdall-frontend.pro') diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro index 6cb5774..6b79e62 100644 --- a/heimdall-frontend/heimdall-frontend.pro +++ b/heimdall-frontend/heimdall-frontend.pro @@ -57,7 +57,7 @@ macx { config += x86 x86_64 ppc - QMAKE_CFLAGS_X86_64 = -m64 -mmacosx-version-min=10.5 + QMAKE_CFLAGS_X86_64 = -m64 -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 QMAKE_LFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 -- cgit v1.1 From b22ae7b89f7993f632e10e18c116f293f314575f Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Thu, 19 Feb 2015 03:13:56 +1100 Subject: Removed autotools and VS files, and standardised source dir naming --- heimdall-frontend/heimdall-frontend.pro | 109 -------------------------------- 1 file changed, 109 deletions(-) delete mode 100644 heimdall-frontend/heimdall-frontend.pro (limited to 'heimdall-frontend/heimdall-frontend.pro') diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro deleted file mode 100644 index 6b79e62..0000000 --- a/heimdall-frontend/heimdall-frontend.pro +++ /dev/null @@ -1,109 +0,0 @@ -# ---------------------------------------------------- -# This file is generated by the Qt Visual Studio Add-in. -# ------------------------------------------------------ - -TEMPLATE = app -TARGET = heimdall-frontend - -isEmpty(OUTPUTDIR) { - OUTPUTDIR = $$(OUTPUTDIR) -} - -macx { - message("") - - isEmpty(QT_FRAMEWORKS_DIR) { - QT_FRAMEWORKS_DIR = $$(QT_FRAMEWORKS_DIR) - } - - isEmpty(QT_FRAMEWORKS_DIR) { - message("QT_FRAMEWORKS_DIR not specified, using default:") - QT_FRAMEWORKS_DIR = /Library/Frameworks - } - - message("QT_FRAMEWORKS_DIR = $$QT_FRAMEWORKS_DIR") - message("") - - isEmpty(QMAKE_MACOSX_DEPLOYMENT_TARGET) { - QMAKE_MACOSX_DEPLOYMENT_TARGET = $$(QMAKE_MACOSX_DEPLOYMENT_TARGET) - } - - isEmpty(QMAKE_MACOSX_DEPLOYMENT_TARGET) { - message("QMAKE_MACOSX_DEPLOYMENT_TARGET not specified, using default:") - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 - } - - message("QMAKE_MACOSX_DEPLOYMENT_TARGET = $$QMAKE_MACOSX_DEPLOYMENT_TARGET") - message("") - - isEmpty(QMAKE_MAC_SDK) { - QMAKE_MAC_SDK = $$(QMAKE_MAC_SDK) - } - - isEmpty(QMAKE_MAC_SDK) { - message("QMAKE_MAC_SDK not specified, using default:") - QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.7.sdk - } - - message("QMAKE_MAC_SDK = $$QMAKE_MAC_SDK") - message("") - - PRIVATE_FRAMEWORKS.files = $$QT_FRAMEWORKS_DIR/QtCore.framework \ - $$QT_FRAMEWORKS_DIR//QtGui.framework $$QT_FRAMEWORKS_DIR/QtXml.framework - PRIVATE_FRAMEWORKS.path = Contents/Frameworks - - QMAKE_BUNDLE_DATA += PRIVATE_FRAMEWORKS - LIBS += -L/usr/lib - - config += x86 x86_64 ppc - - QMAKE_CFLAGS_X86_64 = -m64 -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET - QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 - QMAKE_LFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 - - isEmpty(OUTPUTDIR) { - DESTDIR = /Applications - } else { - DESTDIR = $$OUTPUTDIR - } - -} else { - win32 { # It is recommended that Windows users compile via VS2010, but just in case... - DESTDIR = ../Win32 - - !isEmpty(OUTPUTDIR) { - target.path = $$OUTPUTDIR - INSTALLS += target - } - } else { - DESTDIR = ../Linux - - isEmpty(OUTPUTDIR) { - target.path = /usr/local/bin - } else { - target.path = $$OUTPUTDIR - } - - INSTALLS += target - } -} - -QMAKE_CXXFLAGS += -std=c++0x - -unix:LIBS += -lz ../libpit/libpit-1.4.a -win32:LIBS += ../Win32/Release/lib/libpit.lib - -QT += core gui xml -CONFIG += release -DEFINES += QT_LARGEFILE_SUPPORT -INCLUDEPATH += ./GeneratedFiles \ - ./GeneratedFiles/Release \ - ../libpit/Source \ - . -unix:INCLUDEPATH += /usr/include -DEPENDPATH += . -MOC_DIR += ./GeneratedFiles/release -OBJECTS_DIR += release -UI_DIR += ./GeneratedFiles -RCC_DIR += ./GeneratedFiles -include(heimdall-frontend.pri) -- cgit v1.1