Changeset 0e50af7d344d8dccde19ef4457d246733326fd18

Timestamp:

28/09/07 17:07:47 (1 year ago)

Author:

Mark Moriarty <markfm@videolan.org>

git-committer:

Mark Moriarty <markfm@videolan.org> 1190992067 +0000

git-parent:

[df17e3467436effb0a13934eb5231bb61b509e92]

git-author:

Mark Moriarty <markfm@videolan.org> 1190992067 +0000

Message:

Cygwin adjustments -- skip x264 win32 patch, rename the pthreadGC2.a, build full gettext

Files:

• extras/contrib/src/Makefile (modified) (3 diffs)

extras/contrib/src/Makefile

@@ -392 +392 @@
-endif
-ifneq ($(HOST),$(BUILD))
-
+
+
-    ( cd $< && make -C gettext-runtime/intl && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
+  else
+    # We are compiling for MinGW on Cygwin -- build the full current gettext
+    ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
+  endif
-else
-# Build and install the whole gettext
@@ -1296 +1301 @@
-    $(EXTRACT_GZ)
-ifdef HAVE_WIN32
+  ifndef HAVE_CYGWIN
-    (cd x264;patch -p0 <../Patches/x264-20050624-win32.patch)
+  endif
-else
-    patch -p0 < Patches/x264.patch
@@ -2165 +2172 @@
-.pthreads: pthreads
-    (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && cp -v *.a $(PREFIX)/lib/)
+ifdef HAVE_CYGWIN
+# for some reason Cygwin builds libpthreadGC2.a
+    mv $(PREFIX)/lib/libpthreadGC2.a $(PREFIX)/lib/libpthread.a
+endif
-    $(INSTALL_NAME)
-    touch $@