Browse Source

updated build configuration

tags/1.3
Sven Oliver Moll 1 year ago
parent
commit
8a1ef5c636
3 changed files with 2 additions and 60 deletions
  1. 0
    28
      src/buildconfig.pri
  2. 1
    1
      src/fridgegrid/fridgegrid.pro
  3. 1
    31
      src/src.pro

+ 0
- 28
src/buildconfig.pri View File

@@ -1,28 +0,0 @@
#############################################################################
# src/buildconfig.pri
# hand hacked by SvOlli
# released as public domain
#############################################################################

contains( TEMPLATE, app ) {
is_test = $$find( OUT_PWD, "/tests/" )
count( is_test, 1 ) {
DESTDIR = $${TESTDIR}
} else {
DESTDIR = $${BINDIR}
}
} else {
contains( CONFIG, plugin ) {
DESTDIR = $${DLLDIR}
} else {
DESTDIR = $${LIBDIR}
}
}

contains( QMAKE_CXX, g++ ) {
QMAKE_CXXFLAGS_DEBUG += -pedantic -Wall -Wno-long-long
QMAKE_CXXFLAGS_RELEASE += -ffunction-sections -fdata-sections
!macx {
QMAKE_LFLAGS_RELEASE += -Wl,--gc-sections -rdynamic
}
}

+ 1
- 1
src/fridgegrid/fridgegrid.pro View File

@@ -3,7 +3,7 @@ PROJECT = fridgegrid
TEMPLATE = app
QT += xml widgets

include ( ../buildconfig.pri )
include( $${QMAKEDIR}/buildconfig.pri )
DESTDIR = $${BINDIR}

RESOURCES += ../resources/FridgeGrid.qrc

+ 1
- 31
src/src.pro View File

@@ -1,36 +1,6 @@

# only allow out of tree builds (like qt creator)
equals( _PRO_FILE_PWD_, $${OUT_PWD} ) {
error( "in-tree builds are prohibited." );
}

# define common directories
BINDIR = $${OUT_PWD}/bin
LIBDIR = $${OUT_PWD}/tmp/lib
DLLDIR = $${OUT_PWD}/dll
TESTDIR = $${OUT_PWD}/test
TOOLSDIR = $${OUT_PWD}/tools

# make sure they exist
#mkpath( $${BINDIR} )
#mkpath( $${LIBDIR} )
#mkpath( $${DLLDIR} )
#mkpath( $${TESTDIR} )
#mkpath( $${TOOLSDIR} )

# store them for subdirs to use
cache( BINDIR, set stash, BINDIR )
cache( LIBDIR, set stash, LIBDIR )
cache( DLLDIR, set stash, DLLDIR )
cache( TESTDIR, set stash, TESTDIR )
cache( TOOLSDIR, set stash, TOOLSDIR )

# make sure that selfbuilt libs are available everywhere
LIBSPATH = -L$${LIBDIR}
cache( LIBS, add stash, LIBSPATH )
include( qmake/buildcache.pri )

TEMPLATE = subdirs

SUBDIRS += fridgegrid

message( building for config $$CONFIG )

Loading…
Cancel
Save