Commit fbf73aad authored by Hans Breuer's avatar Hans Breuer

Updated msvc build

parent bbd62f4a
...@@ -15,11 +15,12 @@ GDK_PIXBUF_VER = 2.0 ...@@ -15,11 +15,12 @@ GDK_PIXBUF_VER = 2.0
# but not yet -DINCLUDE_png # but not yet -DINCLUDE_png
##USEGDIP=1 ##USEGDIP=1
# to get _working_ include modules we need respective defines ... # to get _working_ include modules we need respective defines ...
#
BUILT_IN_FORMATS = \ BUILT_IN_FORMATS = \
!IFDEF USEGDIP !IFDEF USEGDIP
-DINCLUDE_gdiplus \ -DINCLUDE_gdiplus \
!ELSE !ELSE
-DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_tiff \ -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_tiff \
!ENDIF !ENDIF
-DINCLUDE_png \ -DINCLUDE_png \
-DINCLUDE_xpm -DINCLUDE_wbmp \ -DINCLUDE_xpm -DINCLUDE_wbmp \
......
...@@ -52,7 +52,7 @@ EXTRALIBS = \ ...@@ -52,7 +52,7 @@ EXTRALIBS = \
$(WTKIT)\lib\i386\wntab32x.lib \ $(WTKIT)\lib\i386\wntab32x.lib \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \ ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
$(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \ $(PANGOWIN32_LIBS) $(PANGOCAIRO_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
$(PANGOCAIRO_LIBS) $(PANGOCAIRO_LIBS)
gdk-win32-backend : gdk-win32-backend :
......
...@@ -55,6 +55,12 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe ...@@ -55,6 +55,12 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe
copy gtk-media-next-ltr.png gtk-media-previous-rtl.png copy gtk-media-next-ltr.png gtk-media-previous-rtl.png
copy gtk-media-forward-ltr.png gtk-media-rewind-rtl.png copy gtk-media-forward-ltr.png gtk-media-rewind-rtl.png
copy gtk-floppy.png gtk-save.png copy gtk-floppy.png gtk-save.png
copy gtk-harddisk.png drive-harddisk.png
copy gtk-directory.png folder.png
copy gtk-directory.png folder-remote.png
copy gtk-home.png user-home.png
copy gtk-directory.png user-desktop.png
copy gtk-file.png text-x-generic.png
cd ..\24 cd ..\24
copy gtk-go-forward-ltr.png gtk-go-back-rtl.png copy gtk-go-forward-ltr.png gtk-go-back-rtl.png
copy gtk-go-back-ltr.png gtk-go-forward-rtl.png copy gtk-go-back-ltr.png gtk-go-forward-rtl.png
...@@ -65,6 +71,12 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe ...@@ -65,6 +71,12 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe
copy gtk-media-next-ltr.png gtk-media-previous-rtl.png copy gtk-media-next-ltr.png gtk-media-previous-rtl.png
copy gtk-media-forward-ltr.png gtk-media-rewind-rtl.png copy gtk-media-forward-ltr.png gtk-media-rewind-rtl.png
copy gtk-floppy.png gtk-save.png copy gtk-floppy.png gtk-save.png
copy gtk-harddisk.png drive-harddisk.png
copy gtk-directory.png folder.png
copy gtk-directory.png folder-remote.png
copy gtk-home.png user-home.png
copy gtk-directory.png user-desktop.png
copy gtk-file.png text-x-generic.png
cd ..\.. cd ..\..
del gtkicontheme.obj del gtkicontheme.obj
gtk-update-icon-cache --force --ignore-theme-index \ gtk-update-icon-cache --force --ignore-theme-index \
...@@ -101,6 +113,7 @@ gtk_OBJECTS_deprecated = \ ...@@ -101,6 +113,7 @@ gtk_OBJECTS_deprecated = \
gtklistitem.obj \ gtklistitem.obj \
gtkprogress.obj \ gtkprogress.obj \
gtktipsquery.obj \ gtktipsquery.obj \
gtkshow.obj \
gtksignal.obj \ gtksignal.obj \
gtkpixmap.obj \ gtkpixmap.obj \
gtkpreview.obj \ gtkpreview.obj \
...@@ -144,7 +157,6 @@ gtk_OBJECTS_file = \ ...@@ -144,7 +157,6 @@ gtk_OBJECTS_file = \
gtkfilefilter.obj \ gtkfilefilter.obj \
gtkfilesystem.obj \ gtkfilesystem.obj \
gtkfilesystemmodel.obj \ gtkfilesystemmodel.obj \
gtkfilesystemwin32.obj \
gtk_OBJECTS_print = \ gtk_OBJECTS_print = \
gtkprint-win32.obj \ gtkprint-win32.obj \
...@@ -193,6 +205,7 @@ gtk_OBJECTS = \ ...@@ -193,6 +205,7 @@ gtk_OBJECTS = \
gtkaccessible.obj \ gtkaccessible.obj \
gtkaction.obj \ gtkaction.obj \
gtkactiongroup.obj \ gtkactiongroup.obj \
gtkactivatable.obj \
gtkadjustment.obj \ gtkadjustment.obj \
gtkalignment.obj \ gtkalignment.obj \
gtkarrow.obj \ gtkarrow.obj \
...@@ -273,6 +286,7 @@ gtk_OBJECTS = \ ...@@ -273,6 +286,7 @@ gtk_OBJECTS = \
gtkmountoperation.obj \ gtkmountoperation.obj \
gtknotebook.obj \ gtknotebook.obj \
gtkobject.obj \ gtkobject.obj \
gtkorientable.obj \
gtkpagesetup.obj \ gtkpagesetup.obj \
gtkpaned.obj \ gtkpaned.obj \
gtkpapersize.obj \ gtkpapersize.obj \
...@@ -347,6 +361,7 @@ gtk_public_h_sources = \ ...@@ -347,6 +361,7 @@ gtk_public_h_sources = \
gtkaccessible.h \ gtkaccessible.h \
gtkaction.h \ gtkaction.h \
gtkactiongroup.h \ gtkactiongroup.h \
gtkactivatable.h \
gtkadjustment.h \ gtkadjustment.h \
gtkalignment.h \ gtkalignment.h \
gtkarrow.h \ gtkarrow.h \
......
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