summaryrefslogtreecommitdiffstats
path: root/win/tools
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:21 -0600
commitdfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch)
treec297348a55df66c571de4525646e0b9762427353 /win/tools
parentb7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff)
downloadtdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz
tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'win/tools')
-rw-r--r--win/tools/build_tdelibs_dbg10
-rw-r--r--win/tools/build_tdelibs_rel10
-rwxr-xr-xwin/tools/kde_env2
3 files changed, 11 insertions, 11 deletions
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index b252b10ac..5a6c31512 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -47,15 +47,15 @@ $additional \
tdecore \
tdeui \
kio \
-kresources \
+tderesources \
kabc/vcard \
kabc \
-kutils \
-kparts \
-kmdi \
+tdeutils \
+tdeparts \
+tdemdi \
kioslave/gzip \
kioslave/bzip2 \
-interfaces/ktexteditor \
+interfaces/tdetexteditor \
kate/interfaces \
kate/part \
; do
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 2a9cabbd6..2cd412542 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 \
+tderesources \
kabc/vcard \
kabc \
-kutils \
-kparts \
-kmdi \
+tdeutils \
+tdeparts \
+tdemdi \
kioslave/gzip \
kioslave/bzip2 \
-interfaces/ktexteditor \
+interfaces/tdetexteditor \
kate/interfaces \
kate/part \
; do
diff --git a/win/tools/kde_env b/win/tools/kde_env
index a8c721a5d..0fbf1410c 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\\kfile;$INCLUDE"
# Version information for binaries
# We're changing this from time to time