• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

作図ソフト dia の改良版


Commit MetaInfo

Revisãoc8d33d0d2c7adab9e9e7adbb80b347aee5e02708 (tree)
Hora2009-08-19 19:40:57
AutorHans Breuer <hans@breu...>
CommiterHans Breuer

Mensagem de Log

Allow to configure PYTHON_VERSION via make.msc

Mudança Sumário

Diff

--- a/bindings/makefile.msc
+++ b/bindings/makefile.msc
@@ -2,15 +2,14 @@ TOP = ..\..
22
33 !INCLUDE $(TOP)\glib\build\win32\make.msc
44
5-!IFNDEF DEBUG
6-PYTHON = ..\..\..\python23
7-#PYTHON = ..\..\..\python25
8-EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib
9-#EXTRALIBS = $(PYTHON)\Python-2.5\PC\VC6\python25.lib user32.lib
10-!ELSE
11-PYTHON = ..\..\..\python25
12-EXTRALIBS = $(PYTHON)\Python-2.5\PC\VC6\python25_d.lib user32.lib
5+!IFNDEF PYTHON_VERSION
6+PYTHON_VERSION=23
137 !ENDIF
8+!IFNDEF PYTHON
9+PYTHON = ..\..\..\python$(PYTHON_VERSION)
10+!ENDIF
11+
12+EXTRALIBS = $(PYTHON)\libs\python$(PYTHON_VERSION).lib user32.lib
1413
1514 INCLUDES = \
1615 -I.. \
--- a/plug-ins/python/makefile.msc
+++ b/plug-ins/python/makefile.msc
@@ -2,18 +2,15 @@ TOP = ..\..\..
22
33 !INCLUDE $(TOP)\glib\build\win32\make.msc
44
5-PYTHON = ..\..\..\..\python23
6-!IFNDEF DEBUG
7-EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib
8-!ELSE
9-EXTRALIBS = $(PYTHON)\Python-2.3\PC\python23_d.lib user32.lib
5+!IFNDEF PYTHON_VERSION
6+PYTHON_VERSION=23
107 !ENDIF
11-
12-!IFNDEF DEBUG
13-# Debug Release!
14-OPTIMIZE = -Zi -MD
8+!IFNDEF PYTHON
9+PYTHON = $(TOP)\..\python$(PYTHON_VERSION)
1510 !ENDIF
1611
12+EXTRALIBS = $(PYTHON)\libs\python$(PYTHON_VERSION).lib user32.lib
13+
1714 # we don't depend on Gtk at runtime, but some dia headers
1815 # need it at compile time
1916 CFLAGS = -FImsvc_recommended_pragmas.h \