Adopt for linix-g++ spec

preferencesAboutTextFull
Anatoly Mihalchenko 13 years ago
parent c035333f28
commit c33d6a290c
  1. 19
      Sankore_3.1.pro
  2. 1
      src/desktop/desktop.pri
  3. 7
      src/frameworks/frameworks.pri
  4. 5
      src/gui/gui.pri
  5. 7
      src/pdf-merger/pdfMerger.pri

@ -86,6 +86,7 @@ BUILD_DIR = build
macx:BUILD_DIR = $$BUILD_DIR/macx macx:BUILD_DIR = $$BUILD_DIR/macx
win32:BUILD_DIR = $$BUILD_DIR/win32 win32:BUILD_DIR = $$BUILD_DIR/win32
linux-g++:BUILD_DIR = $$BUILD_DIR/linux linux-g++:BUILD_DIR = $$BUILD_DIR/linux
linux-g++-32:BUILD_DIR = $$BUILD_DIR/linux
linux-g++-64:BUILD_DIR = $$BUILD_DIR/linux linux-g++-64:BUILD_DIR = $$BUILD_DIR/linux
CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
@ -109,7 +110,7 @@ win32 {
QMAKE_CXXFLAGS_RELEASE += /Od \ QMAKE_CXXFLAGS_RELEASE += /Od \
/Zi /Zi
QMAKE_LFLAGS_RELEASE += /DEBUG QMAKE_LFLAGS_RELEASE += /DEBUG
UB_LIBRARY.path = $$DESTDIR UB_LIBRARY.path = DESTDIR
UB_I18N.path = $$DESTDIR/i18n UB_I18N.path = $$DESTDIR/i18n
UB_ETC.path = $$DESTDIR UB_ETC.path = $$DESTDIR
UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library
@ -117,6 +118,7 @@ win32 {
system(echo "$$VERSION" > $$BUILD_DIR/version) system(echo "$$VERSION" > $$BUILD_DIR/version)
system(echo "$$LONG_VERSION" > $$BUILD_DIR/longversion) system(echo "$$LONG_VERSION" > $$BUILD_DIR/longversion)
system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion) system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
} }
macx { macx {
@ -323,6 +325,21 @@ linux-g++ {
system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion) system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
} }
linux-g++-32 {
LIBS += -lcrypto
QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp
UB_LIBRARY.path = $$DESTDIR
UB_I18N.path = $$DESTDIR/i18n
UB_ETC.path = $$DESTDIR
UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library
system(mkdir -p $$BUILD_DIR)
system(echo "$$VERSION" > $$BUILD_DIR/version)
system(echo "$$LONG_VERSION" > $$BUILD_DIR/longversion)
system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
}
linux-g++-64 { linux-g++-64 {
LIBS += -lcrypto LIBS += -lcrypto
QMAKE_CFLAGS += -fopenmp QMAKE_CFLAGS += -fopenmp

@ -24,3 +24,4 @@ win32 {
macx:SOURCES += src/desktop/UBWindowCapture_mac.mm macx:SOURCES += src/desktop/UBWindowCapture_mac.mm
linux-g++:SOURCES += src/desktop/UBWindowCapture_linux.cpp linux-g++:SOURCES += src/desktop/UBWindowCapture_linux.cpp
linux-g++-32:SOURCES += src/desktop/UBWindowCapture_linux.cpp

@ -38,4 +38,9 @@ linux-g++ {
SOURCES += src/frameworks/UBPlatformUtils_linux.cpp \ SOURCES += src/frameworks/UBPlatformUtils_linux.cpp \
src/frameworks/UBDesktopServices_linux.cpp src/frameworks/UBDesktopServices_linux.cpp
} }
linux-g++-32 {
SOURCES += src/frameworks/UBPlatformUtils_linux.cpp \
src/frameworks/UBDesktopServices_linux.cpp
}

@ -108,3 +108,8 @@ linux-g++ {
SOURCES += src/gui/UBKeyboardPalette_linux.cpp SOURCES += src/gui/UBKeyboardPalette_linux.cpp
} }
linux-g++-32 {
SOURCES += src/gui/UBKeyboardPalette_linux.cpp
}

@ -72,4 +72,9 @@ linux-g++ {
LIBS += -lz LIBS += -lz
} }
linux-g++-32 {
LIBS += -lz
}

Loading…
Cancel
Save