From a3d4302df6c5a0f1c550ad3bf08dd4cab6713090 Mon Sep 17 00:00:00 2001 From: mlong Date: Sun, 7 Mar 2021 08:17:22 -0600 Subject: [PATCH] Updating subtree .pro files --- cpress/cpress.pro | 2 ++ cpress/diskimg/diskimg.pro | 6 +++++- cpress/libhfs/libhfs.pro | 5 +++-- cpress/nufxlib/nufxlib.pro | 4 +++- cpress/zlib/zlib.pro | 5 ++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cpress/cpress.pro b/cpress/cpress.pro index f3aa6a1..7744564 100644 --- a/cpress/cpress.pro +++ b/cpress/cpress.pro @@ -2,6 +2,8 @@ TEMPLATE = subdirs SUBDIRS = zlib nufxlib diskimg libhfs +DEFINES += _CRT_NONSTDC_NO_WARNINGS +DEFINES += _CRT_SECURE_NO_WARNINGS libhfs.depends = zlib nufxlib.depends = zlib diff --git a/cpress/diskimg/diskimg.pro b/cpress/diskimg/diskimg.pro index 934fc2f..e74fec7 100644 --- a/cpress/diskimg/diskimg.pro +++ b/cpress/diskimg/diskimg.pro @@ -2,12 +2,16 @@ CONFIG += c++14 #CONFIG += debug_and_release #TARGET = $$qtLibraryTarget(diskimg) TARGET = diskimg -DEFINES += QT_DEPRECATED_WARNINGS TEMPLATE = lib CONFIG += dll + +DEFINES += EXCISE_GPL_CODE DEFINES += DISKIMG_EXPORTS +DEFINES += QT_NO_DEPRECATED_WARNINGS +DEFINES += _CRT_NONSTDC_NO_WARNINGS +DEFINES += _CRT_SECURE_NO_WARNINGS SOURCES += $$files($$PWD/../ciderpress/diskimg/*.cpp) diff --git a/cpress/libhfs/libhfs.pro b/cpress/libhfs/libhfs.pro index 1605341..218f9da 100644 --- a/cpress/libhfs/libhfs.pro +++ b/cpress/libhfs/libhfs.pro @@ -2,9 +2,10 @@ CONFIG += c++14 #CONFIG += debug_and_release #TARGET = $$qtLibraryTarget(zlib) TARGET = libhfs -DEFINES += QT_DEPRECATED_WARNINGS TEMPLATE = lib - +DEFINES += QT_NO_DEPRECATED_WARNINGS +DEFINES += _CRT_NONSTDC_NO_WARNINGS +DEFINES += _CRT_SECURE_NO_WARNINGS CONFIG += staticlib SOURCES += $$files($$PWD/../ciderpress/diskimg/libhfs/*.c) diff --git a/cpress/nufxlib/nufxlib.pro b/cpress/nufxlib/nufxlib.pro index a37fa6c..5e6faab 100644 --- a/cpress/nufxlib/nufxlib.pro +++ b/cpress/nufxlib/nufxlib.pro @@ -2,8 +2,10 @@ CONFIG += c++14 #CONFIG += debug_and_release #TARGET = $$qtLibraryTarget(nufxlib) TARGET = nufxlib -DEFINES += QT_DEPRECATED_WARNINGS +DEFINES += QT_NO_DEPRECATED_WARNINGS +DEFINES += _CRT_NONSTDC_NO_WARNINGS +DEFINES += _CRT_SECURE_NO_WARNINGS TEMPLATE = lib QMAKE_LFLAGS += /NOENTRY diff --git a/cpress/zlib/zlib.pro b/cpress/zlib/zlib.pro index e467b0c..83f4fef 100644 --- a/cpress/zlib/zlib.pro +++ b/cpress/zlib/zlib.pro @@ -2,9 +2,12 @@ CONFIG += c++14 #CONFIG += debug_and_release #TARGET = $$qtLibraryTarget(zlib) TARGET = zlib -DEFINES += QT_DEPRECATED_WARNINGS TEMPLATE = lib +DEFINES += QT_NO_DEPRECATED_WARNINGS +DEFINES += _CRT_NONSTDC_NO_WARNINGS +DEFINES += _CRT_SECURE_NO_WARNINGS + CONFIG += staticlib SOURCES += $$files($$PWD/../ciderpress/zlib/*.c)