From 7929ff71a246efc562467cf7d01b78148168809e Mon Sep 17 00:00:00 2001 From: sbh Date: Mon, 2 Jul 2012 06:26:36 +0000 Subject: [PATCH] Changed settings in .pro file to provide compatibility with Arcadia build system (bop). And Eclipse's project files added. --- .cproject | 316 +++++++++++++++++++++++++++++++++++++++++++++++++ .project | 83 +++++++++++++ src/Common.pro | 17 +-- 3 files changed, 408 insertions(+), 8 deletions(-) create mode 100644 .cproject create mode 100644 .project diff --git a/.cproject b/.cproject new file mode 100644 index 000000000..595caf4e5 --- /dev/null +++ b/.cproject @@ -0,0 +1,316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make + + install + true + true + true + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 000000000..a7ca17476 --- /dev/null +++ b/.project @@ -0,0 +1,83 @@ + + + GUI_SRC + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.autoBuildTarget + all + + + org.eclipse.cdt.make.core.buildArguments + suit-build.py + + + org.eclipse.cdt.make.core.buildCommand + python + + + org.eclipse.cdt.make.core.buildLocation + ${workspace_loc}/bop.build/suit-build/v5.1.18 + + + org.eclipse.cdt.make.core.cleanBuildTarget + clean + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + false + + + org.eclipse.cdt.make.core.enableCleanBuild + true + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.fullBuildTarget + + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + false + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/src/Common.pro b/src/Common.pro index 0b65f10f4..29e2104e3 100644 --- a/src/Common.pro +++ b/src/Common.pro @@ -13,23 +13,24 @@ win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe isEmpty( HEADERS ):HEADERS = *.h isEmpty( SOURCES ):SOURCES = *.cxx -MOC_DIR = ../../moc +MOC_DIR = ../../../tmp/$$(CONFIG_ID)/moc unix { - OBJECTS_DIR = ../../$$(CONFIG_ID)/obj + OBJECTS_DIR = ../../../tmp/$$(CONFIG_ID)/obj contains( TEMPLATE, lib ) { - DESTDIR = ../../$(CONFIG_ID)/lib + DESTDIR = ../../../SUIT/$(CONFIG_ID)/lib } else { - DESTDIR = ../../$(CONFIG_ID)/bin + DESTDIR = ../../../SUIT/$(CONFIG_ID)/bin } - INCLUDEPATH += ../../$(CONFIG_ID)/include - LIBS += -L../../$(CONFIG_ID)/lib + HEADERS_DIR = ../../../SUIT/$(CONFIG_ID)/include + INCLUDEPATH += $${HEADERS_DIR} + LIBS += -L../../../SUIT/$(CONFIG_ID)/lib - GUIResources = ../../$(CONFIG_ID)/resources + GUIResources = ../../../SUIT/$(CONFIG_ID)/resources includes.files = $$HEADERS - includes.path = ../../$(CONFIG_ID)/include + includes.path = $${HEADERS_DIR} INSTALLS += includes } -- 2.39.2