summaryrefslogtreecommitdiffstats
path: root/win/tools
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
commit7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch)
treec76702a7f6310fbe9d437e347535422e836e94e9 /win/tools
parenta2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff)
parent27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff)
downloadtdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz
tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'win/tools')
-rw-r--r--win/tools/build_tdelibs_dbg18
-rw-r--r--win/tools/build_tdelibs_rel16
-rwxr-xr-xwin/tools/kde_env2
3 files changed, 18 insertions, 18 deletions
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index b252b10ac..b3dcd7695 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -47,15 +47,15 @@ $additional \
tdecore \
tdeui \
kio \
-kresources \
-kabc/vcard \
+tderesources \
+tdeabc/vcard \
kabc \
-kutils \
-kparts \
-kmdi \
-kioslave/gzip \
-kioslave/bzip2 \
-interfaces/ktexteditor \
+tdeutils \
+tdeparts \
+tdemdi \
+tdeioslave/gzip \
+tdeioslave/bzip2 \
+interfaces/tdetexteditor \
kate/interfaces \
kate/part \
; do
@@ -69,7 +69,7 @@ kate/part \
done
cd kdewidgets
-qmake makekdewidgets.pro && $make clean && $make || exit 1
+qmake maketdewidgets.pro && $make clean && $make || exit 1
qmake && $make clean && $make || exit 1
# copy kdewidgets plugin for Qt Designer
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 2a9cabbd6..2fe77ef36 100644
--- a/win/tools/build_tdelibs_rel
+++ b/win/tools/build_tdelibs_rel
@@ -47,15 +47,15 @@ tdecore \
tdeui \
kstyles/thinkeramik/widget-engine \
kio \
-kresources \
-kabc/vcard \
+tderesources \
+tdeabc/vcard \
kabc \
-kutils \
-kparts \
-kmdi \
-kioslave/gzip \
-kioslave/bzip2 \
-interfaces/ktexteditor \
+tdeutils \
+tdeparts \
+tdemdi \
+tdeioslave/gzip \
+tdeioslave/bzip2 \
+interfaces/tdetexteditor \
kate/interfaces \
kate/part \
; do
diff --git a/win/tools/kde_env b/win/tools/kde_env
index a8c721a5d..c8e630de3 100755
--- a/win/tools/kde_env
+++ b/win/tools/kde_env
@@ -14,7 +14,7 @@ fi
# Generic settings
export KDELIBS=$KDEWIN\\tdelibs # KDElibs/win32 source directory
-export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE"
+export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\tdemdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\tdefile;$INCLUDE"
# Version information for binaries
# We're changing this from time to time