← Back to branch summary

~chrisccoulson/oxide/lp1504853

« back to all changes in this revision

Viewing changes to qt/gyp.pro

  • Committer: Chris Coulson
  • Date: 2013-07-26 22:30:14 UTC
  • Revision ID: chris.coulson@canonical.com-20130726223014-22diaj17fd9luojc
Get rid of liboxideprivate.so. It doesn't really make any sense to split functionality between 2 libraries and then have to expose private implementation details across API boundaries. Now we have a single public library exposing the QtQuick API, and a tiny Qml plugin to register the types

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/gyp.pro
9
9
isEmpty(PREFIX) {
10
10
    PREFIX = /usr/local
11
11
}
12
 
uri = com.canonical.Oxide
13
 
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
14
12
 
15
13
gyp_generate.target = $${DEPTH}/$${GYP_GENERATED_MAKEFILE}
16
14
gyp_generate.commands = \
17
 
    $${DEPTH}/gyp_oxide \
18
 
    -I$${PWD}/oxide_qt.gypi \
19
 
    -Dqmlplugin_rpath=\'\\\$\$\$\$ORIGIN/$$system(python -c \'import os.path; print os.path.relpath(\"$${PREFIX}/lib/oxide-qt\", \"$$installPath\")\')\' \
20
 
    -Dqt_install_prefix=\'$${PREFIX}\'
 
15
    cd $$DEPTH ; ./gyp_oxide \
 
16
    -I$${PWD}/qt.gypi \
 
17
    -Dlinux_sandbox_path=\'$${PREFIX}/lib/oxide-qt/oxide-sandbox\'
21
18
QMAKE_EXTRA_TARGETS += gyp_generate
22
19
 
23
20
gypimpl.target = gypimpl
31
28
PRE_TARGETDEPS += gypimpl
32
29
 
33
30
OTHER_FILES += \
34
 
    oxide-qt/core/core.gyp \
35
 
    oxide-qt/oxide_qt.gypi \
36
 
    oxide-qt/qmlplugin/qmlplugin.gyp \
37
 
    oxide-qt/renderer/renderer.gyp \
38
 
    oxide-qt/system.gyp
 
31
    qt/lib/lib.gyp \
 
32
    qt/qmlplugin/qmlplugin.gyp \
 
33
    qt/qt.gypi \
 
34
    qt/renderer/renderer.gyp \
 
35
    qt/system.gyp
39
36
 
40
37
QMAKE_CLEAN += -r \
41
38
    $${DEPTH}/Makefile.oxide \