From dad42352f4ad47d34caf50040367dc2a95772baa Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 18 Aug 2013 10:14:48 -0500 Subject: Rename KStyle to TDEStyle to avoid conflicts with KDE4. --- win/common.pro | 2 +- .../kstyles/activeheart/widget-engine/genembed.pro | 17 -------- .../activeheart/widget-engine/widget-engine.pro | 17 -------- win/pro_files/kstyles/common.pro | 12 ------ win/pro_files/kstyles/dotNET/dotnet/dotnet.pro | 10 ----- win/pro_files/kstyles/highcolor/highcolor.pro | 10 ----- win/pro_files/kstyles/keramik/genembed.pro | 17 -------- win/pro_files/kstyles/keramik/keramik.pro | 14 ------ win/pro_files/kstyles/klegacy/klegacy.pro | 8 ---- win/pro_files/kstyles/kstyles.pro | 11 ----- win/pro_files/kstyles/kthemestyle/themestyle.pro | 15 ------- win/pro_files/kstyles/light/light.pro | 11 ----- win/pro_files/kstyles/plastik/plastik.pro | 9 ---- .../kstyles/slickerstyle/slicker/slicker.pro | 8 ---- .../kstyles/thinkeramik/widget-engine/genembed.pro | 26 ----------- .../thinkeramik/widget-engine/thinkeramik_rel.pro | 50 ---------------------- .../thinkeramik/widget-engine/widget-engine.pro | 26 ----------- .../activeheart/widget-engine/genembed.pro | 17 ++++++++ .../activeheart/widget-engine/widget-engine.pro | 17 ++++++++ win/pro_files/tdestyles/common.pro | 12 ++++++ win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro | 10 +++++ win/pro_files/tdestyles/highcolor/highcolor.pro | 10 +++++ win/pro_files/tdestyles/keramik/genembed.pro | 17 ++++++++ win/pro_files/tdestyles/keramik/keramik.pro | 14 ++++++ win/pro_files/tdestyles/klegacy/klegacy.pro | 8 ++++ win/pro_files/tdestyles/kthemestyle/themestyle.pro | 15 +++++++ win/pro_files/tdestyles/light/light.pro | 11 +++++ win/pro_files/tdestyles/plastik/plastik.pro | 9 ++++ .../tdestyles/slickerstyle/slicker/slicker.pro | 8 ++++ win/pro_files/tdestyles/tdestyles.pro | 11 +++++ .../thinkeramik/widget-engine/genembed.pro | 26 +++++++++++ .../thinkeramik/widget-engine/thinkeramik_rel.pro | 50 ++++++++++++++++++++++ .../thinkeramik/widget-engine/widget-engine.pro | 26 +++++++++++ win/tdelibs_export_win.h | 6 +-- win/tools/build_tdelibs_dbg | 4 +- win/tools/build_tdelibs_rel | 2 +- 36 files changed, 268 insertions(+), 268 deletions(-) delete mode 100644 win/pro_files/kstyles/activeheart/widget-engine/genembed.pro delete mode 100644 win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro delete mode 100644 win/pro_files/kstyles/common.pro delete mode 100644 win/pro_files/kstyles/dotNET/dotnet/dotnet.pro delete mode 100644 win/pro_files/kstyles/highcolor/highcolor.pro delete mode 100644 win/pro_files/kstyles/keramik/genembed.pro delete mode 100644 win/pro_files/kstyles/keramik/keramik.pro delete mode 100644 win/pro_files/kstyles/klegacy/klegacy.pro delete mode 100644 win/pro_files/kstyles/kstyles.pro delete mode 100644 win/pro_files/kstyles/kthemestyle/themestyle.pro delete mode 100644 win/pro_files/kstyles/light/light.pro delete mode 100644 win/pro_files/kstyles/plastik/plastik.pro delete mode 100644 win/pro_files/kstyles/slickerstyle/slicker/slicker.pro delete mode 100644 win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro delete mode 100644 win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro delete mode 100644 win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro create mode 100644 win/pro_files/tdestyles/activeheart/widget-engine/genembed.pro create mode 100644 win/pro_files/tdestyles/activeheart/widget-engine/widget-engine.pro create mode 100644 win/pro_files/tdestyles/common.pro create mode 100644 win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro create mode 100644 win/pro_files/tdestyles/highcolor/highcolor.pro create mode 100644 win/pro_files/tdestyles/keramik/genembed.pro create mode 100644 win/pro_files/tdestyles/keramik/keramik.pro create mode 100644 win/pro_files/tdestyles/klegacy/klegacy.pro create mode 100644 win/pro_files/tdestyles/kthemestyle/themestyle.pro create mode 100644 win/pro_files/tdestyles/light/light.pro create mode 100644 win/pro_files/tdestyles/plastik/plastik.pro create mode 100644 win/pro_files/tdestyles/slickerstyle/slicker/slicker.pro create mode 100644 win/pro_files/tdestyles/tdestyles.pro create mode 100644 win/pro_files/tdestyles/thinkeramik/widget-engine/genembed.pro create mode 100644 win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro create mode 100644 win/pro_files/tdestyles/thinkeramik/widget-engine/widget-engine.pro (limited to 'win') diff --git a/win/common.pro b/win/common.pro index 52478b898..f5c2f1af7 100644 --- a/win/common.pro +++ b/win/common.pro @@ -109,7 +109,7 @@ contains( TEMPLATE, lib ) { !contains( CONFIG, trinitylib ) { DESTDIR = $$KDELIBDESTDIR } - contains( CONFIG, kstyle ) { + contains( CONFIG, tdestyle ) { DESTDIR = $$KDEBINDESTDIR/lib/trinity/plugins/styles CONFIG += plugin } diff --git a/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro b/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro deleted file mode 100644 index 21ab07a78..000000000 --- a/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app - -include( $(KDELIBS)/win/common.pro ) - - -win32 { - CONFIG +=console - CONIG -=windows -} - -DESTDIR=. -TARGET = genembed - -SOURCES = \ -genembed.cpp - - diff --git a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro b/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro deleted file mode 100644 index 9245377cc..000000000 --- a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro +++ /dev/null @@ -1,17 +0,0 @@ -include( ../../common.pro ) - -system( bash kmoc ) -system( qmake genembed.pro -o Makefile.genembed ) -system( nmake /f Makefile.genembed clean ) -system( nmake /f Makefile.genembed ) -system( bash ./genemb.sh ) - -TARGET = activeheart$$KDEBUG - -SOURCES = \ -colorutil.cpp \ -gradients.cpp \ -activeheart.cpp \ -pixmaploader.cpp - - diff --git a/win/pro_files/kstyles/common.pro b/win/pro_files/kstyles/common.pro deleted file mode 100644 index 6cc40111c..000000000 --- a/win/pro_files/kstyles/common.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = lib - -CONFIG += kstyle - -include( $(KDELIBS)/win/common.pro ) - - -# needed to export library classes: -DEFINES += MAKE_KSTYLE_LIB - -LIBS += $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX - diff --git a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro b/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro deleted file mode 100644 index d9ca9d8c3..000000000 --- a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro +++ /dev/null @@ -1,10 +0,0 @@ -include( ../../common.pro ) - -TARGET = dotnet$$KDEBUG - -SOURCES = \ -dotnet.cpp - -system( moc dotnet.h -o moc/dotnet.moc ) - - diff --git a/win/pro_files/kstyles/highcolor/highcolor.pro b/win/pro_files/kstyles/highcolor/highcolor.pro deleted file mode 100644 index 57bfca812..000000000 --- a/win/pro_files/kstyles/highcolor/highcolor.pro +++ /dev/null @@ -1,10 +0,0 @@ -include( ../common.pro ) - -TARGET = highcolor$$KDEBUG - -system( bash kmoc ) - -SOURCES = \ -highcolor.cpp - - diff --git a/win/pro_files/kstyles/keramik/genembed.pro b/win/pro_files/kstyles/keramik/genembed.pro deleted file mode 100644 index 21ab07a78..000000000 --- a/win/pro_files/kstyles/keramik/genembed.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app - -include( $(KDELIBS)/win/common.pro ) - - -win32 { - CONFIG +=console - CONIG -=windows -} - -DESTDIR=. -TARGET = genembed - -SOURCES = \ -genembed.cpp - - diff --git a/win/pro_files/kstyles/keramik/keramik.pro b/win/pro_files/kstyles/keramik/keramik.pro deleted file mode 100644 index 42094301c..000000000 --- a/win/pro_files/kstyles/keramik/keramik.pro +++ /dev/null @@ -1,14 +0,0 @@ -include( ../common.pro ) - -TARGET = keramik$$KDEBUG - -system( bash kmoc ) - -SOURCES = \ -colorutil.cpp \ -gradients.cpp \ -keramik.cpp \ -pixmaploader.cpp - -system( bash ./genemb.sh ) - diff --git a/win/pro_files/kstyles/klegacy/klegacy.pro b/win/pro_files/kstyles/klegacy/klegacy.pro deleted file mode 100644 index 1f280202c..000000000 --- a/win/pro_files/kstyles/klegacy/klegacy.pro +++ /dev/null @@ -1,8 +0,0 @@ -include( ../common.pro ) - -TARGET = klegacy$$KDEBUG - -system( bash kmoc ) - -SOURCES = \ -klegacystyle.cpp diff --git a/win/pro_files/kstyles/kstyles.pro b/win/pro_files/kstyles/kstyles.pro deleted file mode 100644 index c556acfaa..000000000 --- a/win/pro_files/kstyles/kstyles.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += \ -activeheart/widget-engine \ -plastik \ -highcolor \ -keramik \ -light \ -slickerstyle/slicker \ -dotNET/dotnet \ -thinkeramik/widget-engine diff --git a/win/pro_files/kstyles/kthemestyle/themestyle.pro b/win/pro_files/kstyles/kthemestyle/themestyle.pro deleted file mode 100644 index fa55f19e3..000000000 --- a/win/pro_files/kstyles/kthemestyle/themestyle.pro +++ /dev/null @@ -1,15 +0,0 @@ -include( ../common.pro ) - -LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX - -TARGET = kthemestyle$$KDEBUG - -SOURCES = \ -kthemestyle.cpp \ -kthemebase.cpp \ -kstyledirs.cpp - -system( moc kthemestyle.h -o moc/kthemestyle.moc ) -system( moc kthemebase.h -o moc/kthemebase.moc ) - - diff --git a/win/pro_files/kstyles/light/light.pro b/win/pro_files/kstyles/light/light.pro deleted file mode 100644 index 025158c3a..000000000 --- a/win/pro_files/kstyles/light/light.pro +++ /dev/null @@ -1,11 +0,0 @@ -include( ../common.pro ) - -TARGET = light$$KDEBUG - -system( bash kmoc ) - -SOURCES = \ -light.cpp \ -lightstyle-v2.cpp \ -lightstyle-v3.cpp - diff --git a/win/pro_files/kstyles/plastik/plastik.pro b/win/pro_files/kstyles/plastik/plastik.pro deleted file mode 100644 index 51937369c..000000000 --- a/win/pro_files/kstyles/plastik/plastik.pro +++ /dev/null @@ -1,9 +0,0 @@ -include( ../common.pro ) - -TARGET = plastik$$KDEBUG - -system( bash kmoc ) - -SOURCES = \ -plastik.cpp \ -misc.cpp diff --git a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro b/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro deleted file mode 100644 index 0f7bab178..000000000 --- a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro +++ /dev/null @@ -1,8 +0,0 @@ -include( ../../common.pro ) - -TARGET = slicker$$KDEBUG - -system( bash kmoc ) - -SOURCES = \ -slicker.cpp \ No newline at end of file diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro deleted file mode 100644 index 0424eb476..000000000 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro +++ /dev/null @@ -1,26 +0,0 @@ -TEMPLATE = app - -include( $(KDELIBS)/win/common.pro ) - - -unix:LIBS += -ltdefx - -win32 { - CONFIG +=console - CONIG -=windows -} - -DESTDIR=. - - -contains( KW_CONFIG, release ) { -TARGET = genembed_rel -} -!contains( KW_CONFIG, release ) { -TARGET = genembed -} - -SOURCES = \ -genembed.cpp - - diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro deleted file mode 100644 index 62b5d6b39..000000000 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro +++ /dev/null @@ -1,50 +0,0 @@ -# release version with compiled-in tdefx classes -# this is used eg. for QT-only apps like Installer - -TEMPLATE = lib - -unix { - INCLUDEPATH += moc - #force finding libraries in current dir (for installer, etc): - QMAKE_LFLAGS += -Wl,-rpath,. - DEFINES += TDEFX_EXPORT= -} - - -CONFIG += kstyle - -KW_CONFIG = release -CONFIG -= debug -CONFIG += release - -include( $(KDELIBS)/win/common.pro ) - - -LIBS= #DONT BE DEPENDENT ON ANY OTHER LIBS - -CONFIG -= debug - -# needed to export library classes: -DEFINES += MAKE_KSTYLE_LIB MAKE_TDEFX_LIB - -TARGET = thinkeramik - -SOURCES = \ -colorutil.cpp \ -gradients.cpp \ -thinkeramik.cpp \ -pixmaploader.cpp - -#compile in tdefx -SOURCES += \ -../../../tdefx/tdestyle.cpp \ -../../../tdefx/kimageeffect.cpp \ -../../../tdefx/kpixmapeffect.cpp \ -../../../tdefx/kpixmap.cpp - -system( moc thinkeramik.h -o moc/thinkeramik.moc ) -system( moc ../../../tdefx/tdestyle.h -o moc/tdestyle.moc ) - - -system( bash ./genemb.sh ) - diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro deleted file mode 100644 index 41181415f..000000000 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro +++ /dev/null @@ -1,26 +0,0 @@ -include( ../../common.pro ) - -TARGET = thinkeramik$$KDEBUG - -unix { - INCLUDEPATH += moc - #force finding libraries in current dir (for installer, etc): - QMAKE_LFLAGS += -Wl,-rpath,. -} - -system( bash kmoc ) - -SOURCES = \ -colorutil.cpp \ -gradients.cpp \ -thinkeramik.cpp \ -pixmaploader.cpp - -contains( KW_CONFIG, release ) { - system( bash ./genemb.sh _rel ) -} - -!contains( KW_CONFIG, release ) { - system( bash ./genemb.sh ) -} - diff --git a/win/pro_files/tdestyles/activeheart/widget-engine/genembed.pro b/win/pro_files/tdestyles/activeheart/widget-engine/genembed.pro new file mode 100644 index 000000000..21ab07a78 --- /dev/null +++ b/win/pro_files/tdestyles/activeheart/widget-engine/genembed.pro @@ -0,0 +1,17 @@ +TEMPLATE = app + +include( $(KDELIBS)/win/common.pro ) + + +win32 { + CONFIG +=console + CONIG -=windows +} + +DESTDIR=. +TARGET = genembed + +SOURCES = \ +genembed.cpp + + diff --git a/win/pro_files/tdestyles/activeheart/widget-engine/widget-engine.pro b/win/pro_files/tdestyles/activeheart/widget-engine/widget-engine.pro new file mode 100644 index 000000000..9245377cc --- /dev/null +++ b/win/pro_files/tdestyles/activeheart/widget-engine/widget-engine.pro @@ -0,0 +1,17 @@ +include( ../../common.pro ) + +system( bash kmoc ) +system( qmake genembed.pro -o Makefile.genembed ) +system( nmake /f Makefile.genembed clean ) +system( nmake /f Makefile.genembed ) +system( bash ./genemb.sh ) + +TARGET = activeheart$$KDEBUG + +SOURCES = \ +colorutil.cpp \ +gradients.cpp \ +activeheart.cpp \ +pixmaploader.cpp + + diff --git a/win/pro_files/tdestyles/common.pro b/win/pro_files/tdestyles/common.pro new file mode 100644 index 000000000..2f03e7d98 --- /dev/null +++ b/win/pro_files/tdestyles/common.pro @@ -0,0 +1,12 @@ +TEMPLATE = lib + +CONFIG += tdestyle + +include( $(KDELIBS)/win/common.pro ) + + +# needed to export library classes: +DEFINES += MAKE_TDESTYLE_LIB + +LIBS += $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX + diff --git a/win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro b/win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro new file mode 100644 index 000000000..d9ca9d8c3 --- /dev/null +++ b/win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro @@ -0,0 +1,10 @@ +include( ../../common.pro ) + +TARGET = dotnet$$KDEBUG + +SOURCES = \ +dotnet.cpp + +system( moc dotnet.h -o moc/dotnet.moc ) + + diff --git a/win/pro_files/tdestyles/highcolor/highcolor.pro b/win/pro_files/tdestyles/highcolor/highcolor.pro new file mode 100644 index 000000000..57bfca812 --- /dev/null +++ b/win/pro_files/tdestyles/highcolor/highcolor.pro @@ -0,0 +1,10 @@ +include( ../common.pro ) + +TARGET = highcolor$$KDEBUG + +system( bash kmoc ) + +SOURCES = \ +highcolor.cpp + + diff --git a/win/pro_files/tdestyles/keramik/genembed.pro b/win/pro_files/tdestyles/keramik/genembed.pro new file mode 100644 index 000000000..21ab07a78 --- /dev/null +++ b/win/pro_files/tdestyles/keramik/genembed.pro @@ -0,0 +1,17 @@ +TEMPLATE = app + +include( $(KDELIBS)/win/common.pro ) + + +win32 { + CONFIG +=console + CONIG -=windows +} + +DESTDIR=. +TARGET = genembed + +SOURCES = \ +genembed.cpp + + diff --git a/win/pro_files/tdestyles/keramik/keramik.pro b/win/pro_files/tdestyles/keramik/keramik.pro new file mode 100644 index 000000000..42094301c --- /dev/null +++ b/win/pro_files/tdestyles/keramik/keramik.pro @@ -0,0 +1,14 @@ +include( ../common.pro ) + +TARGET = keramik$$KDEBUG + +system( bash kmoc ) + +SOURCES = \ +colorutil.cpp \ +gradients.cpp \ +keramik.cpp \ +pixmaploader.cpp + +system( bash ./genemb.sh ) + diff --git a/win/pro_files/tdestyles/klegacy/klegacy.pro b/win/pro_files/tdestyles/klegacy/klegacy.pro new file mode 100644 index 000000000..1f280202c --- /dev/null +++ b/win/pro_files/tdestyles/klegacy/klegacy.pro @@ -0,0 +1,8 @@ +include( ../common.pro ) + +TARGET = klegacy$$KDEBUG + +system( bash kmoc ) + +SOURCES = \ +klegacystyle.cpp diff --git a/win/pro_files/tdestyles/kthemestyle/themestyle.pro b/win/pro_files/tdestyles/kthemestyle/themestyle.pro new file mode 100644 index 000000000..55d61d97e --- /dev/null +++ b/win/pro_files/tdestyles/kthemestyle/themestyle.pro @@ -0,0 +1,15 @@ +include( ../common.pro ) + +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX + +TARGET = kthemestyle$$KDEBUG + +SOURCES = \ +kthemestyle.cpp \ +kthemebase.cpp \ +tdestyledirs.cpp + +system( moc kthemestyle.h -o moc/kthemestyle.moc ) +system( moc kthemebase.h -o moc/kthemebase.moc ) + + diff --git a/win/pro_files/tdestyles/light/light.pro b/win/pro_files/tdestyles/light/light.pro new file mode 100644 index 000000000..025158c3a --- /dev/null +++ b/win/pro_files/tdestyles/light/light.pro @@ -0,0 +1,11 @@ +include( ../common.pro ) + +TARGET = light$$KDEBUG + +system( bash kmoc ) + +SOURCES = \ +light.cpp \ +lightstyle-v2.cpp \ +lightstyle-v3.cpp + diff --git a/win/pro_files/tdestyles/plastik/plastik.pro b/win/pro_files/tdestyles/plastik/plastik.pro new file mode 100644 index 000000000..51937369c --- /dev/null +++ b/win/pro_files/tdestyles/plastik/plastik.pro @@ -0,0 +1,9 @@ +include( ../common.pro ) + +TARGET = plastik$$KDEBUG + +system( bash kmoc ) + +SOURCES = \ +plastik.cpp \ +misc.cpp diff --git a/win/pro_files/tdestyles/slickerstyle/slicker/slicker.pro b/win/pro_files/tdestyles/slickerstyle/slicker/slicker.pro new file mode 100644 index 000000000..0f7bab178 --- /dev/null +++ b/win/pro_files/tdestyles/slickerstyle/slicker/slicker.pro @@ -0,0 +1,8 @@ +include( ../../common.pro ) + +TARGET = slicker$$KDEBUG + +system( bash kmoc ) + +SOURCES = \ +slicker.cpp \ No newline at end of file diff --git a/win/pro_files/tdestyles/tdestyles.pro b/win/pro_files/tdestyles/tdestyles.pro new file mode 100644 index 000000000..c556acfaa --- /dev/null +++ b/win/pro_files/tdestyles/tdestyles.pro @@ -0,0 +1,11 @@ +TEMPLATE = subdirs + +SUBDIRS += \ +activeheart/widget-engine \ +plastik \ +highcolor \ +keramik \ +light \ +slickerstyle/slicker \ +dotNET/dotnet \ +thinkeramik/widget-engine diff --git a/win/pro_files/tdestyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/tdestyles/thinkeramik/widget-engine/genembed.pro new file mode 100644 index 000000000..0424eb476 --- /dev/null +++ b/win/pro_files/tdestyles/thinkeramik/widget-engine/genembed.pro @@ -0,0 +1,26 @@ +TEMPLATE = app + +include( $(KDELIBS)/win/common.pro ) + + +unix:LIBS += -ltdefx + +win32 { + CONFIG +=console + CONIG -=windows +} + +DESTDIR=. + + +contains( KW_CONFIG, release ) { +TARGET = genembed_rel +} +!contains( KW_CONFIG, release ) { +TARGET = genembed +} + +SOURCES = \ +genembed.cpp + + diff --git a/win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro new file mode 100644 index 000000000..2d243f7de --- /dev/null +++ b/win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro @@ -0,0 +1,50 @@ +# release version with compiled-in tdefx classes +# this is used eg. for QT-only apps like Installer + +TEMPLATE = lib + +unix { + INCLUDEPATH += moc + #force finding libraries in current dir (for installer, etc): + QMAKE_LFLAGS += -Wl,-rpath,. + DEFINES += TDEFX_EXPORT= +} + + +CONFIG += tdestyle + +KW_CONFIG = release +CONFIG -= debug +CONFIG += release + +include( $(KDELIBS)/win/common.pro ) + + +LIBS= #DONT BE DEPENDENT ON ANY OTHER LIBS + +CONFIG -= debug + +# needed to export library classes: +DEFINES += MAKE_TDESTYLE_LIB MAKE_TDEFX_LIB + +TARGET = thinkeramik + +SOURCES = \ +colorutil.cpp \ +gradients.cpp \ +thinkeramik.cpp \ +pixmaploader.cpp + +#compile in tdefx +SOURCES += \ +../../../tdefx/tdestyle.cpp \ +../../../tdefx/kimageeffect.cpp \ +../../../tdefx/kpixmapeffect.cpp \ +../../../tdefx/kpixmap.cpp + +system( moc thinkeramik.h -o moc/thinkeramik.moc ) +system( moc ../../../tdefx/tdestyle.h -o moc/tdestyle.moc ) + + +system( bash ./genemb.sh ) + diff --git a/win/pro_files/tdestyles/thinkeramik/widget-engine/widget-engine.pro b/win/pro_files/tdestyles/thinkeramik/widget-engine/widget-engine.pro new file mode 100644 index 000000000..41181415f --- /dev/null +++ b/win/pro_files/tdestyles/thinkeramik/widget-engine/widget-engine.pro @@ -0,0 +1,26 @@ +include( ../../common.pro ) + +TARGET = thinkeramik$$KDEBUG + +unix { + INCLUDEPATH += moc + #force finding libraries in current dir (for installer, etc): + QMAKE_LFLAGS += -Wl,-rpath,. +} + +system( bash kmoc ) + +SOURCES = \ +colorutil.cpp \ +gradients.cpp \ +thinkeramik.cpp \ +pixmaploader.cpp + +contains( KW_CONFIG, release ) { + system( bash ./genemb.sh _rel ) +} + +!contains( KW_CONFIG, release ) { + system( bash ./genemb.sh ) +} + diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h index b9c42bde4..98f055ae5 100644 --- a/win/tdelibs_export_win.h +++ b/win/tdelibs_export_win.h @@ -115,10 +115,10 @@ #endif // all TDEStyle libs -#ifdef MAKE_KSTYLE_LIB -# define KSTYLE_EXPORT KDE_EXPORT +#ifdef MAKE_TDESTYLE_LIB +# define TDESTYLE_EXPORT KDE_EXPORT #else -# define KSTYLE_EXPORT KDE_IMPORT +# define TDESTYLE_EXPORT KDE_IMPORT #endif #ifdef MAKE_KMDI_LIB diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg index b3dcd7695..25212f67a 100644 --- a/win/tools/build_tdelibs_dbg +++ b/win/tools/build_tdelibs_dbg @@ -27,8 +27,8 @@ echo cd win/9x && $make || exit 1 cd "$pwd" -if [ -d "kstyles/thinkeramik/widget-engine" ] ; then - additional="kstyles/thinkeramik/widget-engine/genembed kstyles/thinkeramik/widget-engine " +if [ -d "tdestyles/thinkeramik/widget-engine" ] ; then + additional="tdestyles/thinkeramik/widget-engine/genembed tdestyles/thinkeramik/widget-engine " fi # all diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel index 2fe77ef36..39b8f9928 100644 --- a/win/tools/build_tdelibs_rel +++ b/win/tools/build_tdelibs_rel @@ -45,7 +45,7 @@ dcop/iceauth \ tdefx \ tdecore \ tdeui \ -kstyles/thinkeramik/widget-engine \ +tdestyles/thinkeramik/widget-engine \ kio \ tderesources \ tdeabc/vcard \ -- cgit v1.2.3