summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpetasis <petasis@f3661a36-4baa-549a-d6c7-40e0ffef350e>2010-07-28 10:48:33 (GMT)
committerpetasis <petasis@f3661a36-4baa-549a-d6c7-40e0ffef350e>2010-07-28 10:48:33 (GMT)
commit95989992d2809450eb131ce0729c6b4b1011db20 (patch)
tree0682bd47159ee3108b6c335b2b0b1ffde92b2181
parent9db3a0297f8397768c80481513009756f318037f (diff)
downloadtkdnd-95989992d2809450eb131ce0729c6b4b1011db20.zip
tkdnd-95989992d2809450eb131ce0729c6b4b1011db20.tar.gz
tkdnd-95989992d2809450eb131ce0729c6b4b1011db20.tar.bz2
win/Makefile: Updated.
-rw-r--r--Changelog2
-rw-r--r--win/Makefile15
2 files changed, 12 insertions, 5 deletions
diff --git a/Changelog b/Changelog
index 41a2723..3eb2a0c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,6 @@
2010-07-28 Petasis George <petasis@iit.demokritos.gr>
+ * win/Makefile: Updated.
+
* library/tkdnd_unix.tcl:
* library/tkdnd_windows.tcl: Fixed bug 2169256.
diff --git a/win/Makefile b/win/Makefile
index 09c779b..ea8a394 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -9,7 +9,11 @@
##
## Location of the Tcl installation:
-TCL = C:\Program Files\Tcl
+TCL = C:\Program Files\Tcl
+TCL_VERSION = 8.4
+TCL_VERSION_NO_DOTS = 84
+TKDND_VERSION = 2.2
+TKDND_VERSION_NO_DOTS = 22
##
## Usage:
@@ -29,7 +33,7 @@ Please `cd` to its location first.
## Include directories:
INCDIR = -I"$(TCL)\include" \
- -I"$(TCL)\include8.4"
+ -I"$(TCL)\include$(TCL_VERSION)"
## library directories:
LIBDIR = -libpath:"$(TCL)\lib"
@@ -57,7 +61,8 @@ RMDIR = rmdir /S /Q
all:
$(cc32) $(cflags) $(INCDIR) TkDND_OleDND.cpp \
- -D PACKAGE_NAME="\"tkdnd\"" -D PACKAGE_VERSION="\"2.1\""
- $(link32) $(lflags) $(LIBDIR) tclstub84.lib tkstub84.lib $(LIBS)\
- TkDND_OleDND.obj -out:"..\libtkdnd20.dll"
+ -D PACKAGE_NAME="\"tkdnd\"" -D PACKAGE_VERSION="\"$(TKDND_VERSION)\""
+ $(link32) $(lflags) $(LIBDIR) tclstub$(TCL_VERSION_NO_DOTS).lib \
+ tkstub$(TCL_VERSION_NO_DOTS).lib $(LIBS)\
+ TkDND_OleDND.obj -out:"..\libtkdnd$(TKDND_VERSION_NO_DOTS).dll"
$(RM) ..\*.exp ..\*.lib *.idb *.pch *.obj