mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-09 19:06:15 +01:00
More Win32 updates. Add missing Win32 files to distributed files.
Remove the obsolete makefile.lcc.
This commit is contained in:
Tor Lillqvist
parent
3907664db4
commit
32dbc0d51c
@ -1,3 +1,11 @@
|
||||
Tue Jan 19 20:52:43 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Add new Win32 files.
|
||||
|
||||
* README.win32: Describe the conditional compilation macros.
|
||||
|
||||
* makefile.lcc: Removed.
|
||||
|
||||
1999-01-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Moved test for localtime_r and rand_r to a place
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
Tue Jan 19 20:52:43 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Add new Win32 files.
|
||||
|
||||
* README.win32: Describe the conditional compilation macros.
|
||||
|
||||
* makefile.lcc: Removed.
|
||||
|
||||
1999-01-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Moved test for localtime_r and rand_r to a place
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
Tue Jan 19 20:52:43 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Add new Win32 files.
|
||||
|
||||
* README.win32: Describe the conditional compilation macros.
|
||||
|
||||
* makefile.lcc: Removed.
|
||||
|
||||
1999-01-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Moved test for localtime_r and rand_r to a place
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
Tue Jan 19 20:52:43 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Add new Win32 files.
|
||||
|
||||
* README.win32: Describe the conditional compilation macros.
|
||||
|
||||
* makefile.lcc: Removed.
|
||||
|
||||
1999-01-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Moved test for localtime_r and rand_r to a place
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
Tue Jan 19 20:52:43 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Add new Win32 files.
|
||||
|
||||
* README.win32: Describe the conditional compilation macros.
|
||||
|
||||
* makefile.lcc: Removed.
|
||||
|
||||
1999-01-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Moved test for localtime_r and rand_r to a place
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
Tue Jan 19 20:52:43 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Add new Win32 files.
|
||||
|
||||
* README.win32: Describe the conditional compilation macros.
|
||||
|
||||
* makefile.lcc: Removed.
|
||||
|
||||
1999-01-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Moved test for localtime_r and rand_r to a place
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
Tue Jan 19 20:52:43 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Add new Win32 files.
|
||||
|
||||
* README.win32: Describe the conditional compilation macros.
|
||||
|
||||
* makefile.lcc: Removed.
|
||||
|
||||
1999-01-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Moved test for localtime_r and rand_r to a place
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
Tue Jan 19 20:52:43 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Add new Win32 files.
|
||||
|
||||
* README.win32: Describe the conditional compilation macros.
|
||||
|
||||
* makefile.lcc: Removed.
|
||||
|
||||
1999-01-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Moved test for localtime_r and rand_r to a place
|
||||
|
||||
@ -21,9 +21,10 @@ EXTRA_DIST = \
|
||||
sanity_check \
|
||||
README.win32 \
|
||||
glib.def \
|
||||
makefile.lcc \
|
||||
makefile.msc \
|
||||
glibconfig.h.win32
|
||||
giowin32.c \
|
||||
glibconfig.h.win32 \
|
||||
config.h.win32
|
||||
|
||||
lib_LTLIBRARIES = libglib.la
|
||||
|
||||
|
||||
42
README.win32
42
README.win32
@ -2,15 +2,45 @@ For more information about the port or GLib, GTk+ and the GIMP to
|
||||
native Windows, see http://www.iki.fi/tml/gimp/win32/ . ("Native"
|
||||
means that we use the Win32 API only, and not any POSIX emulation
|
||||
layer except that provided by the Microsoft runtime C library, and the
|
||||
pthreads emulation library from Cygnus.)
|
||||
pthreads emulation library.)
|
||||
|
||||
As for now, only the Microsoft compiler and tools are really
|
||||
supported. Before compiling, check the BIN definition in
|
||||
makefile.msc. Compile with `nmake -f makefile.msc`. Install with
|
||||
`nmake -f makefile.msc install`. Cygwin (without cygwin runtime,
|
||||
i.e. "mingw32") and maybe LCC-Win32 support will be added later. Note
|
||||
that when using the cygwin compiler and other tools *with* the cygwin
|
||||
runtime the normal Unix configuration method should work.
|
||||
i.e. "mingw32"), and maybe LCC-Win32 support will be added later.
|
||||
|
||||
The thread support uses the pthreads package from Cygnus, which isn't
|
||||
ready yet, and thus really should not be relied upon.
|
||||
When using the cygwin compiler and tools *with* the cygwin runtime the
|
||||
normal Unix configuration method should work as if on Unix (knock on
|
||||
wood).
|
||||
|
||||
With a little work, it might be possible to use the ./configure
|
||||
mechanism also with a "mingw32" configuration. I.e. building GLib for
|
||||
Win32 would use the cygwin tools (and dll), but the produced libraries
|
||||
would not depend on the cygwin runtime being present.
|
||||
|
||||
The following preprocessor macros are used for conditional compilation
|
||||
related to Win32:
|
||||
|
||||
- WIN32 is defined when compiling for the Win32 platform, regardless
|
||||
if using the X11 or Win32 GUI API (of course, in the case of GLib, this
|
||||
dimension isn't significant), regardless whether using a more
|
||||
or less complete Unix emulation runtime layer (like Cygwin) or not.
|
||||
|
||||
- NATIVE_WIN32 is defined when compiling for Win32, *and* without
|
||||
any Unix emulation, other that to the extent provided by the
|
||||
(Microsoft) C library, or the pthreads-win32 library. For instance,
|
||||
pathnames use the native Windows syntax.
|
||||
|
||||
- _MSC_VER is defined when using the Microsoft compiler.
|
||||
|
||||
Currently the Win32 port uses the combination with all three of those
|
||||
on, but eventually the cygwin compiler and tools will be supported
|
||||
also, and in that case _MSC_VER wouldn't be defined.
|
||||
|
||||
Some of the usage of these macros is probably a bit mixed up, and will
|
||||
have to be straightened out when actually trying other combinations.
|
||||
|
||||
The thread support uses the pthreads for Win32 package available from
|
||||
http://sourceware.cygnus.com/pthreads-win32/, which isn't ready yet,
|
||||
and thus really should not be relied upon.
|
||||
|
||||
1
glib.def
1
glib.def
@ -134,6 +134,7 @@ EXPORTS
|
||||
g_hook_unref
|
||||
g_idle_add
|
||||
g_idle_add_full
|
||||
g_idle_remove_by_data
|
||||
g_int_equal
|
||||
g_int_hash
|
||||
g_io_add_watch
|
||||
|
||||
@ -21,9 +21,10 @@ EXTRA_DIST = \
|
||||
sanity_check \
|
||||
README.win32 \
|
||||
glib.def \
|
||||
makefile.lcc \
|
||||
makefile.msc \
|
||||
glibconfig.h.win32
|
||||
giowin32.c \
|
||||
glibconfig.h.win32 \
|
||||
config.h.win32
|
||||
|
||||
lib_LTLIBRARIES = libglib.la
|
||||
|
||||
|
||||
@ -134,6 +134,7 @@ EXPORTS
|
||||
g_hook_unref
|
||||
g_idle_add
|
||||
g_idle_add_full
|
||||
g_idle_remove_by_data
|
||||
g_int_equal
|
||||
g_int_hash
|
||||
g_io_add_watch
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
Tue Jan 19 20:56:02 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Added gthread.def.
|
||||
|
||||
Sun Jan 17 10:58:19 1999 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gthread.def: New file.
|
||||
|
||||
@ -6,7 +6,8 @@ EXTRA_DIST = \
|
||||
gthread-posix.c \
|
||||
gthread-solaris.c \
|
||||
gthread-nspr.c \
|
||||
gthread-none.c
|
||||
gthread-none.c \
|
||||
gthread.def
|
||||
|
||||
libglib = $(top_builddir)/libglib.la # -lglib
|
||||
|
||||
|
||||
99
makefile.lcc
99
makefile.lcc
@ -1,99 +0,0 @@
|
||||
## Makefile for building glib.dll and gmodule.dll with lcc
|
||||
## Use: make -f makefile.lcc
|
||||
## Note that testglib crashes when compiled with lcc...
|
||||
|
||||
INSTALL = copy/y
|
||||
TOUCH = copy/y makefile.lcc
|
||||
|
||||
CFLAGS = -I. -O
|
||||
CC = lcc
|
||||
LD = lcclnk
|
||||
|
||||
BIN = C:\bin
|
||||
|
||||
all : \
|
||||
glibconfig.h \
|
||||
glib.dll \
|
||||
gmodule\gmoduleconf.h \
|
||||
gmodule.dll \
|
||||
testglib.exe \
|
||||
testgmodule.exe
|
||||
|
||||
install : all
|
||||
$(INSTALL) glib.dll $(BIN)
|
||||
$(INSTALL) gmodule.dll $(BIN)
|
||||
$(TOUCH) install
|
||||
|
||||
glib_OBJECTS = \
|
||||
garray.obj \
|
||||
gcache.obj \
|
||||
gcompletion.obj \
|
||||
gdataset.obj \
|
||||
gerror.obj \
|
||||
ghash.obj \
|
||||
glist.obj \
|
||||
gmem.obj \
|
||||
gmessages.obj \
|
||||
gnode.obj \
|
||||
gprimes.obj \
|
||||
gslist.obj \
|
||||
gtimer.obj \
|
||||
gtree.obj \
|
||||
grel.obj \
|
||||
gstring.obj \
|
||||
gstrfuncs.obj \
|
||||
gscanner.obj \
|
||||
gutils.obj
|
||||
|
||||
glib.dll : $(glib_OBJECTS)
|
||||
$(LD) -dll -o glib.dll $(glib_OBJECTS)
|
||||
implib glib.dll
|
||||
|
||||
glibconfig.h: glibconfig.h.win32
|
||||
copy glibconfig.h.win32 glibconfig.h
|
||||
|
||||
.c.obj :
|
||||
$(CC) $(CFLAGS) -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $<
|
||||
|
||||
gmodule_OBJECTS = \
|
||||
gmodule.obj
|
||||
|
||||
gmodule.dll : $(gmodule_OBJECTS)
|
||||
$(LD) -dll -o gmodule.dll $(gmodule_OBJECTS) glib.lib
|
||||
implib gmodule.dll
|
||||
|
||||
gmodule.obj : gmodule\gmodule.c gmodule\gmodule-win32.c
|
||||
$(CC) $(CFLAGS) -Igmodule -DCOMPILING_GMODULE -DG_LIB_DOMAIN=g_log_domain_gmodule gmodule\gmodule.c
|
||||
|
||||
gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32
|
||||
copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h
|
||||
|
||||
testglib.exe : glib.dll testglib.obj
|
||||
$(LD) -o testglib.exe testglib.obj glib.lib
|
||||
|
||||
testglib.obj : testglib.c
|
||||
$(CC) $(CFLAGS) testglib.c
|
||||
|
||||
testgmodule.exe : glib.dll gmodule.dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll
|
||||
$(LD) -o testgmodule.exe testgmodule.obj testgmodule.def glib.lib gmodule.lib
|
||||
|
||||
testgmodule.obj : gmodule\testgmodule.c
|
||||
$(CC) $(CFLAGS) -Igmodule gmodule\testgmodule.c
|
||||
|
||||
libgplugin_a.dll : libgplugin_a.obj
|
||||
$(LD) -dll -o libgplugin_a.dll libgplugin_a.obj glib.lib gmodule.lib
|
||||
|
||||
libgplugin_a.obj : gmodule\libgplugin_a.c
|
||||
$(CC) $(CFLAGS) -Igmodule gmodule\libgplugin_a.c
|
||||
|
||||
libgplugin_b.dll : libgplugin_b.obj
|
||||
$(LD) -dll -o libgplugin_b.dll libgplugin_b.obj /link glib.lib gmodule.lib
|
||||
|
||||
libgplugin_b.obj : gmodule\libgplugin_b.c
|
||||
$(CC) $(CFLAGS) -Igmodule gmodule\libgplugin_b.c
|
||||
|
||||
clean:
|
||||
del *.exe
|
||||
del *.obj
|
||||
del *.dll
|
||||
del *.lib
|
||||
@ -5,7 +5,7 @@
|
||||
# should be in your PATH.
|
||||
BIN = C:\bin
|
||||
|
||||
# This is the Cygnus pthread-win32,
|
||||
# This is the location of pthreads for Win32,
|
||||
# see http://sourceware.cygnus.com/pthreads-win32/
|
||||
PTHREAD_LIB = ..\lib\pthread.lib
|
||||
PTHREAD_INC = ..\include
|
||||
|
||||
Loading…
Reference in New Issue
Block a user