1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00

0030385: Samples - Warnings during generation of projects from .pro files

Define variables ARCH and VCVER in .pro files in qt samples.
This commit is contained in:
apn 2018-11-27 15:13:47 +03:00
parent e05c25c123
commit 7e19e96ae9
3 changed files with 16 additions and 16 deletions

View File

@ -44,13 +44,13 @@ unix {
win32 { win32 {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
DEFINES += _DEBUG DEFINES += _DEBUG
DESTDIR = ./win$(ARCH)/$(VCVER)/bind DESTDIR = ./win$$(ARCH)/$$(VCVER)/bind
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/objd
MOC_DIR = ./src MOC_DIR = ./src
} else { } else {
DEFINES += NDEBUG DEFINES += NDEBUG
DESTDIR = ./win$(ARCH)/$(VCVER)/bin DESTDIR = ./win$$(ARCH)/$$(VCVER)/bin
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj
MOC_DIR = ./src MOC_DIR = ./src
} }
LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath) LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)

View File

@ -58,14 +58,14 @@ unix {
win32 { win32 {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
DEFINES += _DEBUG DEFINES += _DEBUG
DESTDIR = ./win$(ARCH)/$(VCVER)/bind DESTDIR = ./win$$(ARCH)/$$(VCVER)/bind
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/objd
MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd MOC_DIR = ./win$$(ARCH)/$$(VCVER)/mocd
} else { } else {
DEFINES += NDEBUG DEFINES += NDEBUG
DESTDIR = ./win$(ARCH)/$(VCVER)/bin DESTDIR = ./win$$(ARCH)/$$(VCVER)/bin
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj
MOC_DIR = ./win$(ARCH)/$(VCVER)/moc MOC_DIR = ./win$$(ARCH)/$$(VCVER)/moc
} }
LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath) LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)
DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS

View File

@ -61,14 +61,14 @@ unix {
win32 { win32 {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
DEFINES += _DEBUG DEFINES += _DEBUG
DESTDIR = ./win$(ARCH)/$(VCVER)/bind DESTDIR = ./win$$(ARCH)/$$(VCVER)/bind
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/objd
MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd MOC_DIR = ./win$$(ARCH)/$$(VCVER)/mocd
} else { } else {
DEFINES += NDEBUG DEFINES += NDEBUG
DESTDIR = ./win$(ARCH)/$(VCVER)/bin DESTDIR = ./win$$(ARCH)/$$(VCVER)/bin
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj
MOC_DIR = ./win$(ARCH)/$(VCVER)/moc MOC_DIR = ./win$$(ARCH)/$$(VCVER)/moc
} }
LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath) LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)
DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS