Commit 164bbb3d authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

updated

2005-07-30  Hans Breuer  <hans@breuer.org>

	* gtk/makefile.msc.in tests/makefile.msc : updated
parent aadb880f
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> 2005-07-30 Johan Dahlin <jdahlin@async.com.br>
* gtk/gtkctree.c (gtk_ctree_class_init): Do not use | * gtk/gtkctree.c (gtk_ctree_class_init): Do not use |
......
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> 2005-07-30 Johan Dahlin <jdahlin@async.com.br>
* gtk/gtkctree.c (gtk_ctree_class_init): Do not use | * gtk/gtkctree.c (gtk_ctree_class_init): Do not use |
......
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> 2005-07-30 Johan Dahlin <jdahlin@async.com.br>
* gtk/gtkctree.c (gtk_ctree_class_init): Do not use | * gtk/gtkctree.c (gtk_ctree_class_init): Do not use |
......
...@@ -9,9 +9,9 @@ TOP = ..\.. ...@@ -9,9 +9,9 @@ TOP = ..\..
################################################################ ################################################################
# Possibly override versions from build/win32/module.defs # Not the real version but the one used in the DLL names
GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@ GTK_VER = 2,0
GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@ GDK_PIXBUF_VER = 2.0
GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib
...@@ -169,7 +169,8 @@ gtk_OBJECTS = \ ...@@ -169,7 +169,8 @@ gtk_OBJECTS = \
gtkpaned.obj \ gtkpaned.obj \
gtkpathbar.obj \ gtkpathbar.obj \
gtkpixmap.obj \ gtkpixmap.obj \
# gtkplug.obj \ gtkplug.obj \
gtkplug-win32.obj \
gtkpreview.obj \ gtkpreview.obj \
gtkprogress.obj \ gtkprogress.obj \
gtkprogressbar.obj \ gtkprogressbar.obj \
...@@ -192,7 +193,8 @@ gtk_OBJECTS = \ ...@@ -192,7 +193,8 @@ gtk_OBJECTS = \
gtksettings.obj \ gtksettings.obj \
gtksignal.obj \ gtksignal.obj \
gtksizegroup.obj \ gtksizegroup.obj \
# gtksocket.obj \ gtksocket.obj \
gtksocket-win32.obj \
gtkspinbutton.obj \ gtkspinbutton.obj \
gtkstyle.obj \ gtkstyle.obj \
gtkstatusbar.obj \ gtkstatusbar.obj \
...@@ -246,6 +248,7 @@ gtk_OBJECTS = \ ...@@ -246,6 +248,7 @@ gtk_OBJECTS = \
gtkvscrollbar.obj \ gtkvscrollbar.obj \
gtkvseparator.obj \ gtkvseparator.obj \
gtkwidget.obj \ gtkwidget.obj \
gtkwin32embed.obj \
gtkwindow.obj \ gtkwindow.obj \
gtkwindow-decorate.obj gtkwindow-decorate.obj
......
...@@ -29,6 +29,7 @@ TOUCH = copy makefile.msc+nul ...@@ -29,6 +29,7 @@ TOUCH = copy makefile.msc+nul
all : \ all : \
..\config.h \ ..\config.h \
prop-editor.obj \ prop-editor.obj \
testsocket_common.obj \
all-test-apps all-test-apps
..\config.h : ..\config.h.win32 ..\config.h : ..\config.h.win32
...@@ -81,6 +82,14 @@ EXTRA_OBJETCS = prop-editor.obj ...@@ -81,6 +82,14 @@ EXTRA_OBJETCS = prop-editor.obj
EXTRA_OBJETCS = prop-editor.obj EXTRA_OBJETCS = prop-editor.obj
!ENDIF !ENDIF
!IFDEF EXTRA_testsocket
EXTRA_OBJETCS = testsocket_common.obj
!ENDIF
!IFDEF EXTRA_testsocket_child
EXTRA_OBJETCS = testsocket_common.obj
!ENDIF
!IFDEF EXTRA_testtreeview !IFDEF EXTRA_testtreeview
EXTRA_OBJETCS = prop-editor.obj EXTRA_OBJETCS = prop-editor.obj
!ENDIF !ENDIF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment