luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

reflect glib move

Browse Source 
2001-07-20  Hans Breuer  <hans@breuer.org>

	* makefile.msc.in : reflect glib move
This commit is contained in:
Hans Breuer 2001-07-20 17:01:30 +00:00 committed by Hans Breuer
parent 87c759250a
commit 606033cffa
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gmodule/ChangeLog
View File

@ -1,3 +1,7 @@
2001-07-20 Hans Breuer <hans@breuer.org>
* makefile.msc.in : reflect glib move
2001-05-21 Mark Murnane <Mark.Murnane@ireland.sun.com> 2001-05-21 Mark Murnane <Mark.Murnane@ireland.sun.com>
* gmodule.c (g_str_check_suffix): Modified type of string_len * gmodule.c (g_str_check_suffix): Modified type of string_len

18
gmodule/makefile.msc.in
View File

@ -3,7 +3,7 @@
TOP = ..\.. TOP = ..\..
!INCLUDE ..\build\win32\make.msc !INCLUDE $(TOP)\build\win32\make.msc
# Possibly override GLib version in build\win32\module.defs # Possibly override GLib version in build\win32\module.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
@ -12,8 +12,8 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
# Nothing much configurable below # Nothing much configurable below
INCLUDES = -I .. -I . INCLUDES = -I .. -I . -I ..\glib
DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\"
all : \ all : \
gmoduleconf.h \ gmoduleconf.h \
@ -31,18 +31,22 @@ makefile.msc: makefile.msc.in
-e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@ -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule.def gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule.def
$(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) ..\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule.def $(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) \
..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule.def
################ test prog ################ test prog
testgmodule.exe : gmodule-$(GLIB_VER).dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll testgmodule.exe : gmodule-$(GLIB_VER).dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll
$(CC) $(CFLAGS) testgmodule.obj gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console $(CC) $(CFLAGS) testgmodule.obj gmodule-$(GLIB_VER).lib \
..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
libgplugin_a.dll : libgplugin_a.obj libgplugin_a.dll : libgplugin_a.obj
$(CC) $(CFLAGS) -LD libgplugin_a.obj gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS) $(CC) $(CFLAGS) -LD libgplugin_a.obj gmodule-$(GLIB_VER).lib \
..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
libgplugin_b.dll : libgplugin_b.obj libgplugin_b.dll : libgplugin_b.obj
$(CC) $(CFLAGS) -LD libgplugin_b.obj gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS) $(CC) $(CFLAGS) -LD libgplugin_b.obj gmodule-$(GLIB_VER).lib \
..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
clean:: clean::
del gmoduleconf.h del gmoduleconf.h

4
gthread/ChangeLog
View File

@ -1,3 +1,7 @@
2001-07-20 Hans Breuer <hans@breuer.org>
* makefile.msc.in : reflect glib move
2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread-win32.c: Use g_win32_error_message to beautify error * gthread-win32.c: Use g_win32_error_message to beautify error

6
gthread/makefile.msc.in
View File

@ -14,8 +14,8 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
# Nothing much configurable below # Nothing much configurable below
INCLUDES = -I .. -I . INCLUDES = -I .. -I . -I ..\glib
DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" -DG_ENABLE_DEBUG DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
# DEPCFLAGS = $(PTHREAD_CFLAGS) # DEPCFLAGS = $(PTHREAD_CFLAGS)
# DEPCLIBS = $(PTHREAD_LIBS) # DEPCLIBS = $(PTHREAD_LIBS)
all : \ all : \
@ -32,4 +32,4 @@ gthread-impl.obj : gthread-impl.c gthread-win32.c
$(CC) -c $(CFLAGS) gthread-impl.c $(CC) -c $(CFLAGS) gthread-impl.c
gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread.def gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread.def
$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) ..\glib-$(GLIB_VER).lib $(DEPCLIBS) $(LDFLAGS) /def:gthread.def $(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) ..\glib\glib-$(GLIB_VER).lib $(DEPCLIBS) $(LDFLAGS) /def:gthread.def