diff --git a/Makefile b/Makefile index 2647df4..a4f9db6 100644 --- a/Makefile +++ b/Makefile @@ -33,11 +33,6 @@ build/win32/qbolt.a: *.go CC=/usr/lib/mxe/usr/bin/i686-w64-mingw32.static-gcc CGO_ENABLED=1 GOARCH=386 GOOS=windows \ go build ${GOFLAGS} -buildmode=c-archive -o build/win32/qbolt.a -# Copy shared library into place for builds straight out of the IDE - -qbolt/qbolt.a: build/linux/qbolt.a - cp build/linux/qbolt.a qbolt/qbolt.a - # Linux binaries build/linux/qbolt: build/linux/qbolt.a qbolt/* diff --git a/qbolt/qbolt.pro b/qbolt/qbolt.pro index 3eea6ae..082d30c 100644 --- a/qbolt/qbolt.pro +++ b/qbolt/qbolt.pro @@ -11,28 +11,21 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = qbolt TEMPLATE = app -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. +# Enforce Qt deprecations DEFINES += QT_DEPRECATED_WARNINGS - -QMAKE_LIBS += qbolt.a - -QMAKE_CXXFLAGS += -fpermissive # needed for some CGO function pointer interop where the header only specifices void* - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 win32: { # for some reason, qbolt_cgo.h never realises that Q_OS_WIN is defined for win32 builds... weird DEFINES += CGO_WINDOWS - #QMAKE_LFLAGS += -lntdll + QMAKE_LIBS += $$_PRO_FILE_PWD_/../build/win32/qbolt.a QMAKE_LIBS += -lntdll } +linux: { + QMAKE_LIBS += $$_PRO_FILE_PWD_/../build/linux/qbolt.a +} + SOURCES += main.cpp\ mainwindow.cpp \ interop.cpp \