From: Tor Lillqvist Date: Sun, 14 Nov 1999 21:48:31 +0000 (+0000) Subject: Very minor stuff. X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5a298a91cbe693af6558db155e45f8c9998dff0d;p=dana%2Fcg-glib.git Very minor stuff. --- diff --git a/ChangeLog b/ChangeLog index f84e5171..1305e4d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,8 +30,7 @@ * gutils.c * gwin32.c * testglib.c - * Makefile.am - * makefile.{cygwin,msc}: Move the Win32-only functions to the new + * Makefile.am: Move the Win32-only functions to the new file gwin32.c 1999-10-31 Tor Lillqvist diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f84e5171..1305e4d7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -30,8 +30,7 @@ * gutils.c * gwin32.c * testglib.c - * Makefile.am - * makefile.{cygwin,msc}: Move the Win32-only functions to the new + * Makefile.am: Move the Win32-only functions to the new file gwin32.c 1999-10-31 Tor Lillqvist diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f84e5171..1305e4d7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -30,8 +30,7 @@ * gutils.c * gwin32.c * testglib.c - * Makefile.am - * makefile.{cygwin,msc}: Move the Win32-only functions to the new + * Makefile.am: Move the Win32-only functions to the new file gwin32.c 1999-10-31 Tor Lillqvist diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index f84e5171..1305e4d7 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -30,8 +30,7 @@ * gutils.c * gwin32.c * testglib.c - * Makefile.am - * makefile.{cygwin,msc}: Move the Win32-only functions to the new + * Makefile.am: Move the Win32-only functions to the new file gwin32.c 1999-10-31 Tor Lillqvist diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f84e5171..1305e4d7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -30,8 +30,7 @@ * gutils.c * gwin32.c * testglib.c - * Makefile.am - * makefile.{cygwin,msc}: Move the Win32-only functions to the new + * Makefile.am: Move the Win32-only functions to the new file gwin32.c 1999-10-31 Tor Lillqvist diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f84e5171..1305e4d7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -30,8 +30,7 @@ * gutils.c * gwin32.c * testglib.c - * Makefile.am - * makefile.{cygwin,msc}: Move the Win32-only functions to the new + * Makefile.am: Move the Win32-only functions to the new file gwin32.c 1999-10-31 Tor Lillqvist diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f84e5171..1305e4d7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -30,8 +30,7 @@ * gutils.c * gwin32.c * testglib.c - * Makefile.am - * makefile.{cygwin,msc}: Move the Win32-only functions to the new + * Makefile.am: Move the Win32-only functions to the new file gwin32.c 1999-10-31 Tor Lillqvist diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f84e5171..1305e4d7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -30,8 +30,7 @@ * gutils.c * gwin32.c * testglib.c - * Makefile.am - * makefile.{cygwin,msc}: Move the Win32-only functions to the new + * Makefile.am: Move the Win32-only functions to the new file gwin32.c 1999-10-31 Tor Lillqvist diff --git a/README.win32 b/README.win32 index a3178914..34764cf5 100644 --- a/README.win32 +++ b/README.win32 @@ -112,7 +112,7 @@ instructions in that case, too. Install it somewhere, let's say G:\gcc-2.95.2 (//g/gcc-2.95.2 when in Cygwin). Add //g/gcc-2.95.2/H-i586-cygwin32/bin to your - PATH. Below,I assume you use bash. + PATH. I assume you use bash below. Replace the specs file in //g/gcc-2.95.2/H-i586-cygwin32/lib/gcc-lib/i586-cygwin32/2.95.2/specs @@ -314,9 +314,6 @@ diff -ru2 ./w32api/include/wingdi.h ../../src/mingw-runtime-19991107/w32api/incl 5) Whew. That hopefully should be it. -Cheers, ---tml - Next, go back to the GLib directory and build using `make -f makefile.cygwin`. Building the dlls uses the script build-dll which is somewhat of a hack. But I couldn't get things working in a cleaner diff --git a/build-dll b/build-dll index b29a50db..4e137618 100644 --- a/build-dll +++ b/build-dll @@ -7,8 +7,8 @@ # (egcs-1.1.2 release) or gcc-2.95 as distributed by Mumit Khan. For # other combinations, no idea. -GCC=gcc -DLLTOOL=dlltool +GCC="gcc" +DLLTOOL="dlltool" AS=as library=$1; shift