--- glib-1.2.10\makefile.msc.bak 2001-03-15 16:48:50.000000000 +0100 +++ glib-1.2.10\makefile.msc 2005-11-10 16:55:50.171875000 +0100 @@ -3,14 +3,18 @@ # Change this to wherever you want to install the DLLs. This directory # should be in your PATH. -BIN = C:\bin +PREFIX=c:\apps\vc8 +BIN = $(PREFIX)\bin +LIBDIR = $(PREFIX)\lib +INCDIR = $(PREFIX)\include # This is the location of pthreads for Win32, # see http://sourceware.cygnus.com/pthreads-win32/ # We want the 1999-04-07 snapshot. -PTHREADS = ..\pthreads-snap-1999-04-07 -PTHREAD_LIB = $(PTHREADS)\pthread.lib -PTHREAD_INC = -I$(PTHREADS) +#PTHREADS = ..\pthreads-snap-1999-04-07 +PTHREADS = ..\pthreads-snap-2004-11-22 +PTHREAD_LIB = $(LIBDIR)\pthreadVC.lib +PTHREAD_INC = -I$(INCDIR) ################################################################ @@ -44,6 +48,11 @@ $(INSTALL) glib-$(GLIB_VER).dll $(BIN) $(INSTALL) gmodule-$(GLIB_VER).dll $(BIN) $(INSTALL) gthread-$(GLIB_VER).dll $(BIN) + $(INSTALL) glib-$(GLIB_VER).lib $(LIBDIR) + $(INSTALL) gmodule-$(GLIB_VER).lib $(LIBDIR) + $(INSTALL) gthread-$(GLIB_VER).lib $(LIBDIR) + $(INSTALL) glib.h $(INCDIR) + $(INSTALL) glibconfig.h $(INCDIR) glib_OBJECTS = \ garray.obj \ @@ -148,18 +157,18 @@ $(CC) $(CFLAGS) $(PTHREAD_INC) -c gthread\testgthread.c clean: - del config.h - del glibconfig.h - del gmodule\gmoduleconf.h - del *.exe - del *.obj - del *.dll - del *.lib - del *.err - del *.map - del *.sym - del *.exp - del *.lk1 - del *.mk1 - del *.pdb - del *.ilk + -del config.h + -del glibconfig.h + -del gmodule\gmoduleconf.h + -del *.exe + -del *.obj + -del *.dll + -del *.lib + -del *.err + -del *.map + -del *.sym + -del *.exp + -del *.lk1 + -del *.mk1 + -del *.pdb + -del *.ilk