gtk+ r21799 - in branches/gtk-2-14: . gdk-pixbuf gtk

[hans svn gnome org]

Author: hans
Date: Sun Nov 23 17:26:26 2008
New Revision: 21799
URL: http://svn.gnome.org/viewvc/gtk+?rev=21799&view=rev

Log:
2008-11-23  Hans Breuer  <hans breuer org>

	* config.h.win32.in : don't define USE_MMX for msvc
	* gdk-pixbuf/makefile.msc gtk/makefile.msc.in : updated


Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/config.h.win32.in
   branches/gtk-2-14/gdk-pixbuf/makefile.msc
   branches/gtk-2-14/gtk/makefile.msc.in

Modified: branches/gtk-2-14/config.h.win32.in
==============================================================================
--- branches/gtk-2-14/config.h.win32.in	(original)
+++ branches/gtk-2-14/config.h.win32.in	Sun Nov 23 17:26:26 2008
@@ -269,7 +269,9 @@
 /* #undef USE_MEDIALIB25 */
 
 /* Define to 1 if XXM is available and should be used */
+#ifndef _MSC_VER
 #define USE_MMX 1
+#endif
 
 /* Define to 1 if no XInput should be used */
 /* #undef XINPUT_NONE */

Modified: branches/gtk-2-14/gdk-pixbuf/makefile.msc
==============================================================================
--- branches/gtk-2-14/gdk-pixbuf/makefile.msc	(original)
+++ branches/gtk-2-14/gdk-pixbuf/makefile.msc	Sun Nov 23 17:26:26 2008
@@ -25,7 +25,7 @@
 	-DINCLUDE_xpm -DINCLUDE_wbmp \
 	-DINCLUDE_pnm -DINCLUDE_ras
 
-PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
+INCLUDES = -FImsvc_recommended_pragmas.h \
 !IFNDEF USEGDIP
  	$(JPEG_CFLAGS) $(TIFF_CFLAGS) \
 !ENDIF
@@ -111,12 +111,6 @@
 gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols
 	 perl makegdkpixbufalias.pl -def < gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c
 
-## common stuff
-
-INSTALL = copy
-
-CFLAGS = -I. -DHAVE_CONFIG_H
-
 sub-pixops :
 	cd pixops
 	nmake -f makefile.msc
@@ -146,6 +140,8 @@
 	$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib ole32.lib wsock32.lib $(PACKAGE).res \
 	$(LDFLAGS) /implib:$(PACKAGE)-$(PKG_VER).lib /def:$(PACKAGE).def
 
+PKG_CFLAGS = $(INCLUDES) $(DEFINES)
+
 make-inline-pixbuf.exe : make-inline-pixbuf.c
 	$(CC) $(PKG_CFLAGS) -Femake-inline-pixbuf.exe make-inline-pixbuf.c $(PKG_LINK) $(PACKAGE)-$(PKG_VER).lib
 
@@ -183,9 +179,6 @@
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
 
-.c.obj :
-	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
-
 clean::
 	del config.h
 	del gdk-pixbuf-marshal.h

Modified: branches/gtk-2-14/gtk/makefile.msc.in
==============================================================================
--- branches/gtk-2-14/gtk/makefile.msc.in	(original)
+++ branches/gtk-2-14/gtk/makefile.msc.in	Sun Nov 23 17:26:26 2008
@@ -144,7 +144,6 @@
 	gtkfilefilter.obj \
 	gtkfilesystem.obj \
 	gtkfilesystemmodel.obj \
-	gtkfilesystemwin32.obj \
 
 gtk_OBJECTS_print = \
 	gtkprint-win32.obj \
@@ -291,6 +290,7 @@
 	gtkruler.obj \
 	gtkscale.obj \
 	gtkscalebutton.obj \
+	gtkshow.obj \
 	gtkscrollbar.obj \
 	gtkscrolledwindow.obj \
 	gtksearchengine.obj \