aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2007-09-26 19:00:48 +0000
committerAnders Broman <anders.broman@ericsson.com>2007-09-26 19:00:48 +0000
commit4330218b15804ae6b3ff5fd0622110be8d638750 (patch)
tree38cb91c8a7c78c831e712be541e1ef3e89d22e85 /packaging
parent23af5dbf9adb6e2a65e23d97598610f6c3430ecd (diff)
Try to fix the U3 build.
svn path=/trunk/; revision=22988
Diffstat (limited to 'packaging')
-rw-r--r--packaging/u3/win32/makefile.nmake9
1 files changed, 8 insertions, 1 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index 77317ee68d..75b713fc44 100644
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -292,9 +292,16 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util
!IFDEF NEED_LIBPNG_DLL
$(COPY) $(GTK2_DIR)\bin\libpng13.dll $(HOST) $(COPY_FLAGS)
!ENDIF
+!IFDEF NEED_LIBTIFF_DLL
+ $(COPY) $(GTK2_DIR)\bin\libtiff3.dll $(HOST) $(COPY_FLAGS)
+!ENDIF
+!IFDEF NEED_LIBJPEG_DLL
+ $(COPY) $(GTK2_DIR)\bin\jpeg62.dll $(HOST) $(COPY_FLAGS)
+!ENDIF
+
$(COPY) $(GTK2_DIR)\etc\gtk-2.0\*.* $(HOST)\etc\gtk-2.0 $(COPY_FLAGS)
$(COPY) $(GTK2_DIR)\etc\pango\pango.* $(HOST)\etc\pango $(COPY_FLAGS)
- $(COPY) $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders $(COPY_FLAGS)
+# $(COPY) $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders $(COPY_FLAGS)
$(COPY) $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules $(COPY_FLAGS)
!IFDEF GTK_WIMP_DIR
$(COPY) $(GTK_WIMP_DLLSRC_DIR)\libwimp.dll $(HOST)\$(GTK_WIMP_DLLDST_DIR) $(COPY_FLAGS)