diff options
| author | Hans Breuer <hans@breuer.org> | 2005-07-30 18:53:44 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2005-07-30 18:53:44 +0000 |
| commit | 164bbb3d1a6d51f23c0591ce3543e14ef2cc1629 (patch) | |
| tree | 8cfd790c97405ee237489d22aa77b365966e2e26 | |
| parent | aadb880f7f7383874cffa1acf4ee5bfaecd0d22b (diff) | |
| download | gdk-pixbuf-164bbb3d1a6d51f23c0591ce3543e14ef2cc1629.tar.gz | |
updated
2005-07-30 Hans Breuer <hans@breuer.org>
* gtk/makefile.msc.in tests/makefile.msc : updated
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | gtk/makefile.msc.in | 13 | ||||
| -rw-r--r-- | tests/makefile.msc | 9 |
5 files changed, 29 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2005-07-30 Hans Breuer <hans@breuer.org> + + * gtk/makefile.msc.in tests/makefile.msc : updated + 2005-07-30 Johan Dahlin <jdahlin@async.com.br> * gtk/gtkctree.c (gtk_ctree_class_init): Do not use | diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 673d2d3e5..fe1e88204 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2005-07-30 Hans Breuer <hans@breuer.org> + + * gtk/makefile.msc.in tests/makefile.msc : updated + 2005-07-30 Johan Dahlin <jdahlin@async.com.br> * gtk/gtkctree.c (gtk_ctree_class_init): Do not use | diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 673d2d3e5..fe1e88204 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2005-07-30 Hans Breuer <hans@breuer.org> + + * gtk/makefile.msc.in tests/makefile.msc : updated + 2005-07-30 Johan Dahlin <jdahlin@async.com.br> * gtk/gtkctree.c (gtk_ctree_class_init): Do not use | diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 27c126e37..9de1ba657 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -9,9 +9,9 @@ TOP = ..\.. ################################################################ -# Possibly override versions from build/win32/module.defs -GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@ -GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@ +# Not the real version but the one used in the DLL names +GTK_VER = 2,0 +GDK_PIXBUF_VER = 2.0 GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib @@ -169,7 +169,8 @@ gtk_OBJECTS = \ gtkpaned.obj \ gtkpathbar.obj \ gtkpixmap.obj \ -# gtkplug.obj \ + gtkplug.obj \ + gtkplug-win32.obj \ gtkpreview.obj \ gtkprogress.obj \ gtkprogressbar.obj \ @@ -192,7 +193,8 @@ gtk_OBJECTS = \ gtksettings.obj \ gtksignal.obj \ gtksizegroup.obj \ -# gtksocket.obj \ + gtksocket.obj \ + gtksocket-win32.obj \ gtkspinbutton.obj \ gtkstyle.obj \ gtkstatusbar.obj \ @@ -246,6 +248,7 @@ gtk_OBJECTS = \ gtkvscrollbar.obj \ gtkvseparator.obj \ gtkwidget.obj \ + gtkwin32embed.obj \ gtkwindow.obj \ gtkwindow-decorate.obj diff --git a/tests/makefile.msc b/tests/makefile.msc index c5a0191fc..f0891c2c1 100644 --- a/tests/makefile.msc +++ b/tests/makefile.msc @@ -29,6 +29,7 @@ TOUCH = copy makefile.msc+nul all : \ ..\config.h \ prop-editor.obj \ + testsocket_common.obj \ all-test-apps ..\config.h : ..\config.h.win32 @@ -81,6 +82,14 @@ EXTRA_OBJETCS = prop-editor.obj EXTRA_OBJETCS = prop-editor.obj !ENDIF +!IFDEF EXTRA_testsocket +EXTRA_OBJETCS = testsocket_common.obj +!ENDIF + +!IFDEF EXTRA_testsocket_child +EXTRA_OBJETCS = testsocket_common.obj +!ENDIF + !IFDEF EXTRA_testtreeview EXTRA_OBJETCS = prop-editor.obj !ENDIF |