Skip to content

Commit

Permalink
qmake|SDK: Added sdk.pro, install rules for headers
Browse files Browse the repository at this point in the history
Public headers are now specified using a macro that automatically adds
an install rule for them when doing an SDK build.
  • Loading branch information
skyjake committed Feb 25, 2014
1 parent 98ea79b commit 9ba60bf
Show file tree
Hide file tree
Showing 15 changed files with 141 additions and 54 deletions.
4 changes: 2 additions & 2 deletions doomsday/build/build.pro
Expand Up @@ -20,12 +20,12 @@ include(../config.pri)
QMAKE_STRIP = true

# Update the PK3 files.
!deng_nopackres {
!deng_sdk:!deng_nopackres {
runPython2InDir($$PWD/scripts/, packres.py --quiet \"$$OUT_PWD/..\")
}

# Install the launcher.
deng_snowberry {
!deng_sdk:deng_snowberry {
SB_ROOT = ../../snowberry
SB_DIR = $$DENG_BASE_DIR/snowberry

Expand Down
10 changes: 10 additions & 0 deletions doomsday/config.pri
Expand Up @@ -74,6 +74,12 @@ CONFIG(debug, debug|release) {
DEFINES += NDEBUG
}

# SDK build.
deng_sdk {
DEFINES += DENG_SDK_BUILD
echo("SDK build.")
}

# Debugging options.
deng_fakememoryzone: DEFINES += LIBDENG_FAKE_MEMORY_ZONE

Expand All @@ -100,6 +106,10 @@ else:macx: include(config_macx.pri)

# Apply deng_* Configuration -------------------------------------------------

!isEmpty(SDK_PREFIX): DENG_SDK_HEADER_DIR = $$SDK_PREFIX/include/doomsday/de
else:!isEmpty(PREFIX): DENG_SDK_HEADER_DIR = $$PREFIX/include/doomsday/de
else: DENG_SDK_HEADER_DIR = $$OUT_PWD/include/de

unix:deng_ccache {
# ccache can be used to speed up recompilation.
*-clang* {
Expand Down
35 changes: 26 additions & 9 deletions doomsday/libappfw/libappfw.pro
Expand Up @@ -28,7 +28,7 @@ win32 {
}

# Public headers.
HEADERS += \
publicHeaders(root, \
include/de/AtlasProceduralImage \
include/de/BaseGuiApp \
include/de/BaseWindow \
Expand Down Expand Up @@ -76,6 +76,14 @@ HEADERS += \
include/de/VRWindowTransform \
include/de/WindowSystem \
include/de/WindowTransform \
include/de/VariableChoiceWidget \
include/de/VariableToggleWidget \
include/de/VRConfig \
\
include/de/libappfw.h \
)

publicHeaders(ui, \
include/de/ui/ActionItem \
include/de/ui/Data \
include/de/ui/ImageItem \
Expand All @@ -86,12 +94,11 @@ HEADERS += \
include/de/ui/SubmenuItem \
include/de/ui/SubwidgetItem \
include/de/ui/VariableToggleItem \
include/de/VariableChoiceWidget \
include/de/VariableToggleWidget \
include/de/VRConfig \
\
include/de/dialogs/inputdialog.h \
include/de/dialogs/messagedialog.h \
include/de/ui/defs.h \
)

publicHeaders(framework, \
include/de/framework/actionitem.h \
include/de/framework/atlasproceduralimage.h \
include/de/framework/baseguiapp.h \
Expand Down Expand Up @@ -123,10 +130,14 @@ HEADERS += \
include/de/framework/vrwindowtransform.h \
include/de/framework/windowsystem.h \
include/de/framework/windowtransform.h \
include/de/libappfw.h \
include/de/ui/defs.h \
)

publicHeaders(vr, \
include/de/vr/oculusrift.h \
include/de/vr/vrconfig.h \
)

publicHeaders(widgets, \
include/de/widgets/blurwidget.h \
include/de/widgets/buttonwidget.h \
include/de/widgets/choicewidget.h \
Expand All @@ -152,7 +163,13 @@ HEADERS += \
include/de/widgets/tabwidget.h \
include/de/widgets/togglewidget.h \
include/de/widgets/variablechoicewidget.h \
include/de/widgets/variabletogglewidget.h
include/de/widgets/variabletogglewidget.h \
)

publicHeaders(dialogs, \
include/de/dialogs/inputdialog.h \
include/de/dialogs/messagedialog.h \
)

# Sources and private headers.
SOURCES += \
Expand Down
10 changes: 6 additions & 4 deletions doomsday/libdeng2/concurrency.pri
@@ -1,18 +1,20 @@
HEADERS += \
publicHeaders(root, \
include/de/Guard \
include/de/Lockable \
include/de/ReadWriteLockable \
include/de/Task \
include/de/TaskPool \
include/de/Waitable
include/de/Waitable \
)

HEADERS += \
publicHeaders(concurrency, \
include/de/concurrency/guard.h \
include/de/concurrency/lockable.h \
include/de/concurrency/readwritelockable.h \
include/de/concurrency/task.h \
include/de/concurrency/taskpool.h \
include/de/concurrency/waitable.h
include/de/concurrency/waitable.h \
)

SOURCES += \
src/concurrency/guard.cpp \
Expand Down
10 changes: 6 additions & 4 deletions doomsday/libdeng2/data.pri
@@ -1,4 +1,4 @@
HEADERS += \
publicHeaders(root, \
include/de/AccessorValue \
include/de/Archive \
include/de/ArrayValue \
Expand Down Expand Up @@ -51,9 +51,10 @@ HEADERS += \
include/de/WaitableFIFO \
include/de/Writer \
include/de/Zeroed \
include/de/ZipArchive
include/de/ZipArchive \
)

HEADERS += \
publicHeaders(data, \
include/de/data/accessorvalue.h \
include/de/data/archive.h \
include/de/data/arrayvalue.h \
Expand Down Expand Up @@ -105,7 +106,8 @@ HEADERS += \
include/de/data/waitablefifo.h \
include/de/data/writer.h \
include/de/data/zeroed.h \
include/de/data/ziparchive.h
include/de/data/ziparchive.h \
)

SOURCES += \
src/data/accessorvalue.cpp \
Expand Down
10 changes: 6 additions & 4 deletions doomsday/libdeng2/filesys.pri
@@ -1,4 +1,4 @@
HEADERS += \
publicHeaders(root, \
include/de/ArchiveFeed \
include/de/ArchiveEntryFile \
include/de/ByteArrayFile \
Expand All @@ -11,9 +11,10 @@ HEADERS += \
include/de/LibraryFile \
include/de/NativeFile \
include/de/NativePath \
include/de/PackageFolder
include/de/PackageFolder \
)

HEADERS += \
publicHeaders(filesys, \
include/de/filesys/archivefeed.h \
include/de/filesys/archiveentryfile.h \
include/de/filesys/bytearrayfile.h \
Expand All @@ -25,7 +26,8 @@ HEADERS += \
include/de/filesys/libraryfile.h \
include/de/filesys/nativefile.h \
include/de/filesys/nativepath.h \
include/de/filesys/packagefolder.h
include/de/filesys/packagefolder.h \
)

SOURCES += \
src/filesys/archivefeed.cpp \
Expand Down
10 changes: 5 additions & 5 deletions doomsday/libdeng2/game.pri
@@ -1,8 +1,8 @@
HEADERS += \
include/de/game/Game

HEADERS += \
include/de/game/game.h
publicHeaders(game, \
include/de/game/Game \
\
include/de/game/game.h \
)

SOURCES += \
src/game/game.cpp
14 changes: 8 additions & 6 deletions doomsday/libdeng2/libdeng2.pro
Expand Up @@ -68,8 +68,7 @@ include(network.pri)
include(scriptsys.pri)
include(widgets.pri)

# Convenience headers.
HEADERS += \
publicHeaders(root, \
include/de/App \
include/de/Asset \
include/de/Clock \
Expand Down Expand Up @@ -98,14 +97,16 @@ HEADERS += \
include/de/TextStreamLogSink \
include/de/UnixInfo \
include/de/Vector \
include/de/Version

HEADERS += \
include/de/Version \
\
include/de/c_wrapper.h \
include/de/charsymbols.h \
include/de/error.h \
include/de/libdeng2.h \
include/de/math.h \
)

publicHeaders(core, \
include/de/core/app.h \
include/de/core/asset.h \
include/de/core/clock.h \
Expand Down Expand Up @@ -133,7 +134,8 @@ HEADERS += \
include/de/core/textstreamlogsink.h \
include/de/core/unixinfo.h \
include/de/core/vector.h \
include/de/core/version.h
include/de/core/version.h \
)

# Private headers.
HEADERS += \
Expand Down
13 changes: 6 additions & 7 deletions doomsday/libdeng2/network.pri
@@ -1,4 +1,4 @@
HEADERS += \
publicHeaders(root, \
include/de/Address \
include/de/Beacon \
include/de/BlockPacket \
Expand All @@ -9,9 +9,10 @@ HEADERS += \
include/de/Protocol \
include/de/RecordPacket \
include/de/Socket \
include/de/Transmitter
include/de/Transmitter \
)

HEADERS += \
publicHeaders(net, \
include/de/net/address.h \
include/de/net/beacon.h \
include/de/net/blockpacket.h \
Expand All @@ -22,10 +23,8 @@ HEADERS += \
include/de/net/protocol.h \
include/de/net/recordpacket.h \
include/de/net/socket.h \
include/de/net/transmitter.h

# Private headers.
HEADERS +=
include/de/net/transmitter.h \
)

SOURCES += \
src/net/address.cpp \
Expand Down
10 changes: 6 additions & 4 deletions doomsday/libdeng2/scriptsys.pri
@@ -1,4 +1,4 @@
HEADERS += \
publicHeaders(root, \
include/de/ArrayExpression \
include/de/AssignStatement \
include/de/BuiltInExpression \
Expand Down Expand Up @@ -34,9 +34,10 @@ HEADERS += \
include/de/TokenBuffer \
include/de/TokenRange \
include/de/TryStatement \
include/de/WhileStatement
include/de/WhileStatement \
)

HEADERS += \
publicHeaders(scriptsys, \
include/de/scriptsys/arrayexpression.h \
include/de/scriptsys/assignstatement.h \
include/de/scriptsys/builtinexpression.h \
Expand Down Expand Up @@ -72,7 +73,8 @@ HEADERS += \
include/de/scriptsys/tokenbuffer.h \
include/de/scriptsys/tokenrange.h \
include/de/scriptsys/trystatement.h \
include/de/scriptsys/whilestatement.h
include/de/scriptsys/whilestatement.h \
)

SOURCES += \
src/scriptsys/arrayexpression.cpp \
Expand Down
10 changes: 6 additions & 4 deletions doomsday/libdeng2/widgets.pri
@@ -1,4 +1,4 @@
HEADERS += \
publicHeaders(root, \
include/de/Action \
include/de/Animation \
include/de/AnimationVector \
Expand All @@ -9,9 +9,10 @@ HEADERS += \
include/de/RuleRectangle \
include/de/RootWidget \
include/de/ScalarRule \
include/de/Widget
include/de/Widget \
)

HEADERS += \
publicHeaders(widgets, \
include/de/widgets/action.h \
include/de/widgets/animation.h \
include/de/widgets/animationvector.h \
Expand All @@ -24,7 +25,8 @@ HEADERS += \
include/de/widgets/rulebank.h \
include/de/widgets/rules.h \
include/de/widgets/scalarrule.h \
include/de/widgets/widget.h
include/de/widgets/widget.h \
)

SOURCES += \
src/widgets/action.cpp \
Expand Down
9 changes: 6 additions & 3 deletions doomsday/libgui/libgui.pro
Expand Up @@ -45,7 +45,7 @@ else:unix {
}

# Public headers.
HEADERS += \
publicHeaders(root, \
include/de/Atlas \
include/de/AtlasTexture \
include/de/Canvas \
Expand Down Expand Up @@ -78,7 +78,9 @@ HEADERS += \
include/de/PersistentCanvasWindow \
include/de/RowAtlasAllocator \
include/de/VertexBuilder \
\
)

publicHeaders(gui, \
include/de/gui/atlas.h \
include/de/gui/atlastexture.h \
include/de/gui/canvas.h \
Expand Down Expand Up @@ -115,7 +117,8 @@ HEADERS += \
include/de/gui/opengl.h \
include/de/gui/persistentcanvaswindow.h \
include/de/gui/rowatlasallocator.h \
include/de/gui/vertexbuilder.h
include/de/gui/vertexbuilder.h \
)

# Sources and private headers.
SOURCES += \
Expand Down
5 changes: 3 additions & 2 deletions doomsday/libshell/libshell.pro
Expand Up @@ -23,7 +23,7 @@ DEFINES += __LIBSHELL__
INCLUDEPATH += include

# Public headers.
HEADERS += \
publicHeaders(shell, \
include/de/shell/AbstractLineEditor \
include/de/shell/AbstractLink \
include/de/shell/Action \
Expand Down Expand Up @@ -73,7 +73,8 @@ HEADERS += \
include/de/shell/serverfinder.h \
include/de/shell/textcanvas.h \
include/de/shell/textrootwidget.h \
include/de/shell/textwidget.h
include/de/shell/textwidget.h \
)

# Sources and private headers.
SOURCES += \
Expand Down

0 comments on commit 9ba60bf

Please sign in to comment.