[dia] Allow to configure PYTHON_VERSION via make.msc
- From: Hans Breuer <hans src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [dia] Allow to configure PYTHON_VERSION via make.msc
- Date: Wed, 19 Aug 2009 13:39:56 +0000 (UTC)
commit c8d33d0d2c7adab9e9e7adbb80b347aee5e02708
Author: Hans Breuer <hans breuer org>
Date: Wed Aug 19 12:21:56 2009 +0200
Allow to configure PYTHON_VERSION via make.msc
bindings/makefile.msc | 15 +++++++--------
plug-ins/python/makefile.msc | 15 ++++++---------
2 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/bindings/makefile.msc b/bindings/makefile.msc
index 545770c..4564716 100644
--- a/bindings/makefile.msc
+++ b/bindings/makefile.msc
@@ -2,15 +2,14 @@ TOP = ..\..
!INCLUDE $(TOP)\glib\build\win32\make.msc
-!IFNDEF DEBUG
-PYTHON = ..\..\..\python23
-#PYTHON = ..\..\..\python25
-EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib
-#EXTRALIBS = $(PYTHON)\Python-2.5\PC\VC6\python25.lib user32.lib
-!ELSE
-PYTHON = ..\..\..\python25
-EXTRALIBS = $(PYTHON)\Python-2.5\PC\VC6\python25_d.lib user32.lib
+!IFNDEF PYTHON_VERSION
+PYTHON_VERSION=23
!ENDIF
+!IFNDEF PYTHON
+PYTHON = ..\..\..\python$(PYTHON_VERSION)
+!ENDIF
+
+EXTRALIBS = $(PYTHON)\libs\python$(PYTHON_VERSION).lib user32.lib
INCLUDES = \
-I.. \
diff --git a/plug-ins/python/makefile.msc b/plug-ins/python/makefile.msc
index 69c457e..6afb8fc 100644
--- a/plug-ins/python/makefile.msc
+++ b/plug-ins/python/makefile.msc
@@ -2,18 +2,15 @@ TOP = ..\..\..
!INCLUDE $(TOP)\glib\build\win32\make.msc
-PYTHON = ..\..\..\..\python23
-!IFNDEF DEBUG
-EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib
-!ELSE
-EXTRALIBS = $(PYTHON)\Python-2.3\PC\python23_d.lib user32.lib
+!IFNDEF PYTHON_VERSION
+PYTHON_VERSION=23
!ENDIF
-
-!IFNDEF DEBUG
-# Debug Release!
-OPTIMIZE = -Zi -MD
+!IFNDEF PYTHON
+PYTHON = $(TOP)\..\python$(PYTHON_VERSION)
!ENDIF
+EXTRALIBS = $(PYTHON)\libs\python$(PYTHON_VERSION).lib user32.lib
+
# we don't depend on Gtk at runtime, but some dia headers
# need it at compile time
CFLAGS = -FImsvc_recommended_pragmas.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]