diff options
| author | Hans Breuer <hans@breuer.org> | 2004-11-06 23:23:02 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2004-11-06 23:23:02 +0000 |
| commit | 62a8dd45671ab9846b9045ba163840577f5e97df (patch) | |
| tree | 618d5e2bba07f32e9ab2d12ed4abcd3c75bce62f | |
| parent | 99aac8dd6a314af77677b66ff23b27fd6348b5a0 (diff) | |
| download | pygtk-62a8dd45671ab9846b9045ba163840577f5e97df.tar.gz | |
updated - pygtk is working fine with msvc (but requires
2004-11-06 Hans Breuer <hans@breuer.org>
* config.h.win32 makefile.msc gobject/makefile.msc
gtk/makefile.msc : updated - pygtk is working fine
with msvc (but requires -DDISABLE_THREADING), Thanks!
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | config.h.win32 | 8 | ||||
| -rw-r--r-- | gobject/makefile.msc | 24 | ||||
| -rw-r--r-- | gtk/makefile.msc | 22 | ||||
| -rw-r--r-- | makefile.msc | 18 |
5 files changed, 60 insertions, 18 deletions
@@ -1,3 +1,9 @@ +2004-11-06 Hans Breuer <hans@breuer.org> + + * config.h.win32 makefile.msc gobject/makefile.msc + gtk/makefile.msc : updated - pygtk is working fine + with msvc (but requires -DDISABLE_THREADING), Thanks! + 2004-11-06 Johan Dahlin <johan@gnome.org> * gtk/gtk.override (_wrap_gtk_about_dialog_get_artists) diff --git a/config.h.win32 b/config.h.win32 index 1c7aa301..65dc1dab 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,4 +1,6 @@ -#define PYGTK_MAJOR_VERSION (1) -#define PYGTK_MINOR_VERSION (99) -#define PYGTK_MICRO_VERSION (8) +#define PYGTK_MAJOR_VERSION (2) +#define PYGTK_MINOR_VERSION (4) +#define PYGTK_MICRO_VERSION (1) + +#define VERSION "2.4.1" diff --git a/gobject/makefile.msc b/gobject/makefile.msc index a671eb90..a7287ec7 100644 --- a/gobject/makefile.msc +++ b/gobject/makefile.msc @@ -3,15 +3,19 @@ TOP = ..\..\.. #DEBUG=1 -PYTHON = c:\python23 +#program placement should be handled im make.msc +!IFNDEF PYTHONDIR +PYTHONDIR = c:l\python23 +!ENDIF + !IFNDEF DEBUG -EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib +EXTRALIBS = $(PYTHONDIR)\libs\python23.lib user32.lib !ELSE -EXTRALIBS = $(PYTHON)\libs\python23_d.lib user32.lib +EXTRALIBS = $(PYTHONDIR)\libs\python23_d.lib user32.lib PYD_POSTFIX = _d !ENDIF -EXTRACFLAGS = -I$(PYTHON)\include +EXTRACFLAGS = -I$(PYTHONDIR)\include -DDISABLE_THREADING MODULE_EXT = pyd MODULES = gobject @@ -35,7 +39,7 @@ gdk.c : gdk.defs gdk.override libglade.c : libglade.defs libglade.override .defs.c : - $(PYTHON)\python ../codegen/codegen.py \ + $(PYTHONDIR)\python ../codegen/codegen.py \ $(PYGTK_CODEGEN_DEFINES) \ --register ../pango-types.defs \ --register ../atk-types.defs \ @@ -54,8 +58,7 @@ INCLUDES = \ -FImsvc_recommended_pragmas.h \ -DHAVE_CONFIG_H -I.. -I..\gobject -I. $(EXTRACFLAGS) \ $(GLIB_CFLAGS) $(GTK2_CFLAGS) $(PANGO_CFLAGS) \ - -DGTK_ENABLE_BROKEN \ - -DVERSION=\"1.99.8\" + -DGTK_ENABLE_BROKEN !IFDEF OBJ_gobject OBJECTS = \ @@ -64,6 +67,10 @@ OBJECTS = \ pygobject.obj \ pygflags.obj \ pygenum.obj \ + pygmaincontext.obj \ + pygmainloop.obj \ + pygparamspec.obj \ + pygpointer.obj \ pygtype.obj !ENDIF @@ -80,3 +87,6 @@ $(MODULE)$(PYD_POSTFIX).$(MODULE_EXT) : $(OBJECTS) clean:: del *.pyc del *.pyd + +extra-clean: clean + @: diff --git a/gtk/makefile.msc b/gtk/makefile.msc index efccf8cc..d1d38f80 100644 --- a/gtk/makefile.msc +++ b/gtk/makefile.msc @@ -3,15 +3,19 @@ TOP = ..\..\.. #DEBUG=1 -PYTHON = c:\python23 +#program placement should be handled im make.msc +!IFNDEF PYTHONDIR +PYTHONDIR = c:l\python23 +!ENDIF + !IFNDEF DEBUG -EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib +EXTRALIBS = $(PYTHONDIR)\libs\python23.lib user32.lib !ELSE -EXTRALIBS = $(PYTHON)\libs\python23_d.lib user32.lib +EXTRALIBS = $(PYTHONDIR)\libs\python23_d.lib user32.lib PYD_POSTFIX = _d !ENDIF -EXTRACFLAGS = -I$(PYTHON)\include +EXTRACFLAGS = -I$(PYTHONDIR)\include MODULE_EXT = pyd MODULES = _gtk # libglade @@ -34,8 +38,12 @@ gtk.c : gtk.defs gtk.override gdk.c : gdk.defs gdk.override libglade.c : libglade.defs libglade.override +#same hack as in Makefile.am +gtk-types.c: + @: + .defs.c : - $(PYTHON)\python ../codegen/codegen.py \ + $(PYTHONDIR)\python ../codegen/codegen.py \ $(PYGTK_CODEGEN_DEFINES) \ --register ../pango-types.defs \ --register ../atk-types.defs \ @@ -55,8 +63,7 @@ INCLUDES = \ -FImsvc_recommended_pragmas.h \ -DHAVE_CONFIG_H -I.. -I..\gobject -I. $(EXTRACFLAGS) \ $(GLIB_CFLAGS) $(GTK2_CFLAGS) $(PANGO_CFLAGS) \ - -DGTK_ENABLE_BROKEN \ - -DVERSION=\"1.99.8\" + -DGTK_ENABLE_BROKEN # -I$(LIBGLADE) -I$(LIBXML) @@ -67,7 +74,6 @@ OBJECTS = \ gtkobject-support.obj \ gtk-types.obj \ gdk.obj \ - pygtktreemodel.obj \ pygtkcellrenderer.obj \ pygtktreemodel.obj \ gtk-fake-win32.obj diff --git a/makefile.msc b/makefile.msc index b3814cfb..70d6d69d 100644 --- a/makefile.msc +++ b/makefile.msc @@ -3,7 +3,11 @@ TOP = ..\.. #DEBUG=1 +#program placement should be handled im make.msc +!IFNDEF PYTHONDIR PYTHONDIR = c:\python23 +!ENDIF + !IFNDEF DEBUG EXTRALIBS = $(PYTHONDIR)\libs\python23.lib user32.lib !ELSE @@ -116,3 +120,17 @@ $(MODULE)$(PYD_POSTFIX).$(MODULE_EXT) : $(OBJECTS) clean:: sub-clean del *.pyc del *.pyd + +extra-clean: clean + del atk.c + del pango.c + del config.h + +# the first one asks to give you a chance to break it +install: + @echo Installing to $(PYTHONDIR) + @xcopy pygtk.py $(PYTHONDIR)\Lib + @xcopy /y *.pyd $(PYTHONDIR)\Lib\gtk-2.0\* + @xcopy /y gtk\*.pyd $(PYTHONDIR)\Lib\gtk-2.0\gtk\* + @xcopy /y gtk\*.py $(PYTHONDIR)\Lib\gtk-2.0\gtk\* + @xcopy /y gobject\*.pyd $(PYTHONDIR)\Lib\gtk-2.0\* |