diff options
| author | Tor Lillqvist <tml@src.gnome.org> | 1999-04-24 13:52:51 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 1999-04-24 13:52:51 +0000 |
| commit | 2aa1277d60f63d283a955d40cc681f1d30a067e8 (patch) | |
| tree | 536d4653239139bc39cc6dff0505f13297ab5e35 /makefile.msc | |
| parent | 0269749a67899057d1e861d9b0beebd8e84ae067 (diff) | |
| download | glib-2aa1277d60f63d283a955d40cc681f1d30a067e8.tar.gz | |
Support added for building using a GNU toolchain on Win32,
i.e. gcc -mno-cygwin on cygwin (a.k.a. mingw32, using egcs-1.1.2).
* README.win32: Updated.
* build-dll makefile.cygwin tests/makefile.cygwin: New files.
* glib.h glib.def glibconfig.h.win32 makefile.msc: Slight updates.
* gmain.c: No need to include <fcntl.h> and <io.h> on Win32.
* gmain.c gutils.c testglib.c tests/string-test.c: Test for
NATIVE_WIN32, not _MSC_VER.
* gmutex.c: Must declare g_thread_functions_for_glib_use as
exported (using the GUTILS_C_VAR macro).
* gutils.c gmodule/libgplugin_[ab].c: LibMain not needed.
* gmodule/gmoduleconf.h.win32: Need underscore with gcc.
* gthread/gthread.c: With gcc on Win32, must use memcpy to assign
value of g_thread_functions_for_glib_use (?).
* makefile.msc tests/makefile.msc: Cosmetics.
Diffstat (limited to 'makefile.msc')
| -rw-r--r-- | makefile.msc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/makefile.msc b/makefile.msc index 4edac218d..885bd80c8 100644 --- a/makefile.msc +++ b/makefile.msc @@ -7,8 +7,9 @@ BIN = C:\bin # This is the location of pthreads for Win32, # see http://sourceware.cygnus.com/pthreads-win32/ -PTHREAD_LIB = ..\lib\pthread.lib -PTHREAD_INC = ..\include +PTHREADS = ..\pthreads-snap-1999-04-07 +PTHREAD_LIB = $(PTHREADS)\pthread.lib +PTHREAD_INC = -I $(PTHREADS) ################################################################ @@ -18,7 +19,7 @@ PTHREAD_INC = ..\include CC = cl -G5 -GF -Ox -W3 -MD -nologo # No general LDFLAGS needes -LDFLAGS = /link +LDFLAGS = /link INSTALL = copy GLIB_VER = 1.3 @@ -88,7 +89,7 @@ config.h: config.h.win32 gmodule_OBJECTS = \ gmodule.obj -gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) +gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule\gmodule.def $(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule\gmodule.def gmodule.obj : gmodule\gmodule.c gmodule\gmodule-win32.c @@ -100,11 +101,11 @@ gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32 gthread_OBJECTS = \ gthread.obj -gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) - $(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gthread\gthread.def +gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread\gthread.def + $(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS) /def:gthread\gthread.def gthread.obj : gthread\gthread.c gthread\gthread-posix.c - $(CC) $(CFLAGS) -GD -I$(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread\gthread.c + $(CC) $(CFLAGS) -GD $(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread\gthread.c testglib.exe : glib-$(GLIB_VER).dll testglib.obj $(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console @@ -146,7 +147,7 @@ testgthread.exe : glib-$(GLIB_VER).dll gthread-$(GLIB_VER).dll testgthread.obj $(CC) $(CFLAGS) testgthread.obj glib-$(GLIB_VER).lib gthread-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS) /subsystem:console testgthread.obj : gthread\testgthread.c - $(CC) $(CFLAGS) -I$(PTHREAD_INC) -c gthread\testgthread.c + $(CC) $(CFLAGS) $(PTHREAD_INC) -c gthread\testgthread.c clean: del config.h |