diff options
Diffstat (limited to 'win')
-rw-r--r-- | win/common.pro | 2 | ||||
-rw-r--r-- | win/config.h | 2 | ||||
-rw-r--r-- | win/pro_files/kmdi/test/test.pro | 4 | ||||
-rw-r--r-- | win/pro_files/tdefx/tdefx_rel.pro | 2 | ||||
-rw-r--r-- | win/tdelibs_global_win.h | 4 | ||||
-rwxr-xr-x | win/tools/.check_kde_env | 4 | ||||
-rw-r--r-- | win/tools/build_tdelibs_dbg | 4 | ||||
-rw-r--r-- | win/tools/build_tdelibs_rel | 2 | ||||
-rwxr-xr-x | win/tools/kde_env_custom.template | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/win/common.pro b/win/common.pro index 12816231c..52478b898 100644 --- a/win/common.pro +++ b/win/common.pro @@ -46,7 +46,7 @@ contains(KW_CONFIG,console) { # global binary destination directory isEmpty( KDEBINDESTDIR ) { - KDEBINDESTDIR = $(KDEDIR) + KDEBINDESTDIR = $(TDEDIR) } # global library destination directory diff --git a/win/config.h b/win/config.h index 40bba653b..95ad9bdd4 100644 --- a/win/config.h +++ b/win/config.h @@ -36,7 +36,7 @@ #define HAVE_SYS_TIME_H 1 #endif -/*#define KDEDIR "F:\\KDE" TODO */ +/*#define TDEDIR "F:\\KDE" TODO */ #define KDELIBSUFF "" diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/kmdi/test/test.pro index d400e29f5..e9536cf43 100644 --- a/win/pro_files/kmdi/test/test.pro +++ b/win/pro_files/kmdi/test/test.pro @@ -10,8 +10,8 @@ CONFIG += debug CONFIG += console unix:DEFINES = NO_INCLUDE_MOCFILES QT_NO_COMPAT -unix:LIBS += -lkmdi -L$(KDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts -unix:INCLUDEPATH += . .. $(KDEDIR)/include +unix:LIBS += -lkmdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts +unix:INCLUDEPATH += . .. $(TDEDIR)/include LIBS += $$KDELIBDESTDIR\kmdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX diff --git a/win/pro_files/tdefx/tdefx_rel.pro b/win/pro_files/tdefx/tdefx_rel.pro index e882168c8..0f013895c 100644 --- a/win/pro_files/tdefx/tdefx_rel.pro +++ b/win/pro_files/tdefx/tdefx_rel.pro @@ -12,7 +12,7 @@ DEFINES += MAKE_TDEFX_LIB system( moc kstyle.h -o moc/kstyle.moc ) -LIBS -= "$(KDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(KDEDIR)\lib\ltdl_$(KDE_VER).lib" +LIBS -= "$(TDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(TDEDIR)\lib\ltdl_$(KDE_VER).lib" SOURCES = \ kimageeffect.cpp \ diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h index dfb3432e8..c98f67770 100644 --- a/win/tdelibs_global_win.h +++ b/win/tdelibs_global_win.h @@ -79,8 +79,8 @@ int kde_start #ifdef __cplusplus #include <tqstring.h> -# ifndef KDEDIR -# define KDEDIR TQString(KDEWIN32_DIR) +# ifndef TDEDIR +# define TDEDIR TQString(KDEWIN32_DIR) # endif # ifndef __KDE_BINDIR # define __KDE_BINDIR TQString(KDEWIN32_DIR "/bin") diff --git a/win/tools/.check_kde_env b/win/tools/.check_kde_env index e4605ed1d..527420204 100755 --- a/win/tools/.check_kde_env +++ b/win/tools/.check_kde_env @@ -7,8 +7,8 @@ if [ -z "$KDEWIN" ] ; then exit 1 fi -if [ -z "$KDEDIR" ] ; then - echo `basename $0`": \$KDEDIR environment variable is not set. Set it to absolute path of tdelibs/win32 binaries, e.g. C:\\kde" +if [ -z "$TDEDIR" ] ; then + echo `basename $0`": \$TDEDIR environment variable is not set. Set it to absolute path of tdelibs/win32 binaries, e.g. C:\\kde" exit 1 fi diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg index cabec259f..b252b10ac 100644 --- a/win/tools/build_tdelibs_dbg +++ b/win/tools/build_tdelibs_dbg @@ -16,7 +16,7 @@ echo "-------------------------------------------------" echo "Building Debug Version of KDElibs/win32" echo "Source directory: \$KDELIBS = $KDELIBS" echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT" -echo "Destination directory: \$KDEDIR = $KDEDIR" +echo "Destination directory: \$TDEDIR = $TDEDIR" if [ -n $noclean ] ; then echo "Options: noclean" fi @@ -73,7 +73,7 @@ qmake makekdewidgets.pro && $make clean && $make || exit 1 qmake && $make clean && $make || exit 1 # copy kdewidgets plugin for Qt Designer -cp $KDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/ +cp $TDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/ cd $pwd diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel index 7490c4866..2a9cabbd6 100644 --- a/win/tools/build_tdelibs_rel +++ b/win/tools/build_tdelibs_rel @@ -16,7 +16,7 @@ echo "-------------------------------------------------" echo "Building Release Version of KDElibs/win32" echo "Source directory: \$KDELIBS = $KDELIBS" echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT" -echo "Destination directory: \$KDEDIR = $KDEDIR" +echo "Destination directory: \$TDEDIR = $TDEDIR" if [ -n $noclean ] ; then echo "Options: noclean" fi diff --git a/win/tools/kde_env_custom.template b/win/tools/kde_env_custom.template index a498805e9..2ffd018c4 100755 --- a/win/tools/kde_env_custom.template +++ b/win/tools/kde_env_custom.template @@ -7,7 +7,7 @@ MSVC="c:\\vs7" # Top KDE Directory - target of your compilation, please change -export KDEDIR="c:\\kde" +export TDEDIR="c:\\kde" # KDElibs/win32 top source directory, please change KDEWIN="c:\\kdewin32" |