summaryrefslogtreecommitdiffstats
path: root/win/tools
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:04:16 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /win/tools
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.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_dbg4
-rw-r--r--win/tools/build_tdelibs_rel4
-rwxr-xr-xwin/tools/kde_env2
3 files changed, 5 insertions, 5 deletions
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index 5a6c31512..3fcfe0c20 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -53,8 +53,8 @@ kabc \
tdeutils \
tdeparts \
tdemdi \
-kioslave/gzip \
-kioslave/bzip2 \
+tdeioslave/gzip \
+tdeioslave/bzip2 \
interfaces/tdetexteditor \
kate/interfaces \
kate/part \
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 2cd412542..399dcadda 100644
--- a/win/tools/build_tdelibs_rel
+++ b/win/tools/build_tdelibs_rel
@@ -53,8 +53,8 @@ kabc \
tdeutils \
tdeparts \
tdemdi \
-kioslave/gzip \
-kioslave/bzip2 \
+tdeioslave/gzip \
+tdeioslave/bzip2 \
interfaces/tdetexteditor \
kate/interfaces \
kate/part \
diff --git a/win/tools/kde_env b/win/tools/kde_env
index 0fbf1410c..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\\tdemdi;$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