Skip to content

Commit

Permalink
qmake: Renamed plugin targets
Browse files Browse the repository at this point in the history 
Plugins will be henceforth named in a consistent manner and placed in
a directory specially reserved for plugin binaries.
  • Loading branch information
@skyjake
skyjake committed Oct 14, 2012
1 parent 69e8ec2 commit 3a4144c
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 67 deletions.
11 changes: 4 additions & 7 deletions doomsday/plugins/dehread/dehread.pro
View file
Expand Up @@ -8,11 +8,8 @@ CONFIG += dengplugin_libdeng2_full
include(../config_plugin.pri)

TEMPLATE = lib

win32|macx: TARGET = dpDehRead
else: TARGET = dpdehread

VERSION = $$DEHREAD_VERSION
TARGET = dehread
VERSION = $$DEHREAD_VERSION

# TODO: the dependencies to internal headers should be removed
# (see comment in dehread.cpp)
Expand Down Expand Up @@ -44,6 +41,6 @@ win32 {
}

macx {
linkToBundledLibdeng2(dpDehRead)
linkToBundledLibdeng(dpDehRead)
linkToBundledLibdeng2(dehread)
linkToBundledLibdeng(dehread)
}
5 changes: 2 additions & 3 deletions doomsday/plugins/directsound/directsound.pro
View file
Expand Up @@ -11,9 +11,8 @@ include(../../dep_eax.pri)
}

TEMPLATE = lib
TARGET = dsDirectSound

VERSION = $$DIRECTSOUND_VERSION
TARGET = directsound
VERSION = $$DIRECTSOUND_VERSION

HEADERS += include/version.h

Expand Down
8 changes: 3 additions & 5 deletions doomsday/plugins/fluidsynth/fluidsynth.pro
View file
Expand Up @@ -5,9 +5,7 @@ include(../config_plugin.pri)
include(../../dep_glib.pri)

TEMPLATE = lib

win32|macx: TARGET = dsFluidSynth
else: TARGET = dsfluidsynth
TARGET = fluidsynth

CONFIG -= qt

Expand All @@ -28,8 +26,8 @@ win32 {
target.path = $$DENG_LIB_DIR
}
macx {
linkToBundledLibdeng2(dsFluidSynth)
linkToBundledLibdeng(dsFluidSynth)
linkToBundledLibdeng2(fluidsynth)
linkToBundledLibdeng(fluidsynth)
}
unix:!macx {
INSTALLS += target
Expand Down
10 changes: 4 additions & 6 deletions doomsday/plugins/fmod/fmod.pro
View file
Expand Up @@ -5,10 +5,8 @@ include(../config_plugin.pri)
include(../../dep_fmod.pri)

TEMPLATE = lib
win32|macx: TARGET = dsFMOD
else: TARGET = dsfmod

VERSION = $$FMOD_VERSION
TARGET = fmod
VERSION = $$FMOD_VERSION

deng_debug: DEFINES += DENG_DSFMOD_DEBUG

Expand Down Expand Up @@ -50,7 +48,7 @@ else {
}

macx {
linkToBundledLibdeng2(dsFMOD)
linkToBundledLibdeng(dsFMOD)
linkToBundledLibdeng2(fmod)
linkToBundledLibdeng(fmod)
}

10 changes: 4 additions & 6 deletions doomsday/plugins/jdoom/jdoom.pro
View file
Expand Up @@ -7,13 +7,11 @@ include(../common/common.pri)
include(../../dep_lzss.pri)

TEMPLATE = lib
win32|macx: TARGET = jDoom
else: TARGET = jdoom
TARGET = doom
VERSION = $$JDOOM_VERSION

DEFINES += __JDOOM__

VERSION = $$JDOOM_VERSION

gamedata.files = $$OUT_PWD/../../jdoom.pk3

macx {
Expand Down Expand Up @@ -140,6 +138,6 @@ win32 {
}

macx {
linkToBundledLibdeng2(jDoom)
linkToBundledLibdeng(jDoom)
linkToBundledLibdeng2(doom)
linkToBundledLibdeng(doom)
}
10 changes: 4 additions & 6 deletions doomsday/plugins/jdoom64/jdoom64.pro
View file
Expand Up @@ -7,13 +7,11 @@ include(../common/common.pri)
include(../../dep_lzss.pri)

TEMPLATE = lib
win32|macx: TARGET = jDoom64
else: TARGET = jdoom64
TARGET = doom64
VERSION = $$JDOOM64_VERSION

DEFINES += __JDOOM64__

VERSION = $$JDOOM64_VERSION

gamedata.files = $$OUT_PWD/../../jdoom64.pk3

macx {
Expand Down Expand Up @@ -96,7 +94,7 @@ win32 {
}

macx {
linkToBundledLibdeng2(jDoom64)
linkToBundledLibdeng(jDoom64)
linkToBundledLibdeng2(doom64)
linkToBundledLibdeng(doom64)
}

10 changes: 4 additions & 6 deletions doomsday/plugins/jheretic/jheretic.pro
View file
Expand Up @@ -7,13 +7,11 @@ include(../common/common.pri)
include(../../dep_lzss.pri)

TEMPLATE = lib
win32|macx: TARGET = jHeretic
else: TARGET = jheretic
TARGET = heretic
VERSION = $$JHERETIC_VERSION

DEFINES += __JHERETIC__

VERSION = $$JHERETIC_VERSION

gamedata.files = $$OUT_PWD/../../jheretic.pk3

macx {
Expand Down Expand Up @@ -103,6 +101,6 @@ win32 {
}

macx {
linkToBundledLibdeng2(jHeretic)
linkToBundledLibdeng(jHeretic)
linkToBundledLibdeng2(heretic)
linkToBundledLibdeng(heretic)
}
10 changes: 4 additions & 6 deletions doomsday/plugins/jhexen/jhexen.pro
View file
Expand Up @@ -7,13 +7,11 @@ include(../common/common.pri)
include(../../dep_lzss.pri)

TEMPLATE = lib
win32|macx: TARGET = jHexen
else: TARGET = jhexen
TARGET = hexen
VERSION = $$JHEXEN_VERSION

DEFINES += __JHEXEN__

VERSION = $$JHEXEN_VERSION

gamedata.files = $$OUT_PWD/../../jhexen.pk3

macx {
Expand Down Expand Up @@ -118,6 +116,6 @@ win32 {
}

macx {
linkToBundledLibdeng2(jHexen)
linkToBundledLibdeng(jHexen)
linkToBundledLibdeng2(hexen)
linkToBundledLibdeng(hexen)
}
10 changes: 4 additions & 6 deletions doomsday/plugins/openal/openal.pro
View file
Expand Up @@ -6,10 +6,8 @@ include(../config_plugin.pri)
include(../../dep_openal.pri)

TEMPLATE = lib
win32|macx: TARGET = dsOpenAL
else: TARGET = dsopenal

VERSION = $$OPENAL_VERSION
TARGET = openal
VERSION = $$OPENAL_VERSION

#DEFINES += DENG_DSOPENAL_DEBUG

Expand All @@ -32,7 +30,7 @@ win32 {
}

macx {
linkToBundledLibdeng2(dsOpenAL)
linkToBundledLibdeng(dsOpenAL)
linkToBundledLibdeng2(openal)
linkToBundledLibdeng(openal)
}

10 changes: 4 additions & 6 deletions doomsday/plugins/wadmapconverter/wadmapconverter.pro
View file
Expand Up @@ -8,10 +8,8 @@ CONFIG += dengplugin_libdeng2_full
include(../config_plugin.pri)

TEMPLATE = lib
win32|macx: TARGET = dpWadMapConverter
else: TARGET = dpwadmapconverter

VERSION = $$WADMAPCONVERTER_VERSION
TARGET = wadmapconverter
VERSION = $$WADMAPCONVERTER_VERSION

deng_debug: DEFINES += DENG_WADMAPCONVERTER_DEBUG

Expand Down Expand Up @@ -47,6 +45,6 @@ win32 {
}

macx {
linkToBundledLibdeng2(dpWadMapConverter)
linkToBundledLibdeng(dpWadMapConverter)
linkToBundledLibdeng2(wadmapconverter)
linkToBundledLibdeng(wadmapconverter)
}
5 changes: 2 additions & 3 deletions doomsday/plugins/winmm/winmm.pro
View file
Expand Up @@ -9,9 +9,8 @@ include(../config_plugin.pri)
}

TEMPLATE = lib
TARGET = dsWinMM

VERSION = $$WINMM_VERSION
TARGET = winmm
VERSION = $$WINMM_VERSION

INCLUDEPATH += include

Expand Down
20 changes: 13 additions & 7 deletions doomsday/postbuild/bundleapp.sh
View file
Expand Up @@ -19,13 +19,19 @@ echo "Clearing existing bundles..."
rm -rf $BUILDDIR/*.bundle

echo "Copying bundles from plugins..."
$CP plugins/dehread/dpDehRead.bundle $BUILDDIR/dpDehRead.bundle
$CP plugins/wadmapconverter/dpWadMapConverter.bundle $BUILDDIR/dpWadMapConverter.bundle
$CP plugins/jdoom/jDoom.bundle $BUILDDIR/jDoom.bundle
$CP plugins/jheretic/jHeretic.bundle $BUILDDIR/jHeretic.bundle
$CP plugins/jhexen/jHexen.bundle $BUILDDIR/jHexen.bundle
$CP plugins/jdoom64/jDoom64.bundle $BUILDDIR/jDoom64.bundle
$CP plugins/fmod/dsFMOD.bundle $BUILDDIR/dsFMOD.bundle
PLUGDIR=$APPDIR/DengPlugins
rm -rf $PLUGDIR
mkdir -p $PLUGDIR
$CP plugins/dehread/dehread.bundle $PLUGDIR/
$CP plugins/wadmapconverter/wadmapconverter.bundle $PLUGDIR/
$CP plugins/jdoom/doom.bundle $PLUGDIR/
$CP plugins/jheretic/heretic.bundle $PLUGDIR/
$CP plugins/jhexen/hexen.bundle $PLUGDIR/
$CP plugins/jdoom64/doom64.bundle $PLUGDIR/
$CP plugins/fmod/fmod.bundle $PLUGDIR/

# Tools
#$CP $SRCDIR/../tools/wadtool/wadtool $APPDIR/Resources
$CP $SRCDIR/../tools/texc/texc $APPDIR/Resources
$CP $SRCDIR/../tools/md2tool/md2tool $APPDIR/Resources

Expand Down

0 comments on commit 3a4144c

Please sign in to comment.