From 32bc152fb39387a7682c825267f00ddd444291f3 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Fri, 7 Apr 2006 17:10:36 +0000 Subject: [PATCH] added gbase64.obj and derive the static libs name from auto* variables 2006-04-07 Hans Breuer * glib/makefile.msc.in : added gbase64.obj and derive the static libs name from auto* variables * glib/makefile.msc.in : link user32.lib for MessageBox() --- ChangeLog | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ glib/makefile.msc.in | 3 ++- gthread/makefile.msc.in | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c20116d6..57502841 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-07 Hans Breuer + + * glib/makefile.msc.in : added gbase64.obj and derive the static libs + name from auto* variables + * glib/makefile.msc.in : link user32.lib for MessageBox() + 2006-04-07 Martyn Russell * glib/gasyncqueue.[ch]: Added private API diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c20116d6..57502841 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2006-04-07 Hans Breuer + + * glib/makefile.msc.in : added gbase64.obj and derive the static libs + name from auto* variables + * glib/makefile.msc.in : link user32.lib for MessageBox() + 2006-04-07 Martyn Russell * glib/gasyncqueue.[ch]: Added private API diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index bf624794..76fe588d 100644 --- a/glib/makefile.msc.in +++ b/glib/makefile.msc.in @@ -18,7 +18,7 @@ all : \ galiasdef.c \ gnulib\gnulib.lib \ libglib-2.0-0.dll \ - glib-2.9s.lib \ + glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \ gspawn-win32-helper.exe \ @@ -32,6 +32,7 @@ glib_OBJECTS = \ gasyncqueue.obj \ gatomic.obj \ gbacktrace.obj \ + gbase64.obj \ gbookmarkfile.obj \ gcache.obj \ gcompletion.obj \ diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in index c672e29c..226bf9cd 100644 --- a/gthread/makefile.msc.in +++ b/gthread/makefile.msc.in @@ -23,4 +23,4 @@ gthread.res : gthread.rc libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def gthread.res $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \ - ..\glib\glib-2.0.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def + ..\glib\glib-2.0.lib $(DEPCLIBS) user32.lib $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def -- 2.34.1