mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
for msvc build
2003-07-20 Hans Breuer <hans@breuer.org> * glib/trio/makefile.msc : (new file) for msvc build * glib/glib.def : removed some duplicated entries * glib/gscanner.c : add same workaround for MSVC(5.0) which does not allow to cast an uint64 to float. Same as in gvaluetransform.c Also move #include <io.h> behind inclusion of "glib.h" which defines the needed G_OS_WIN32 * glib/makefile.msc.in : added gprintf.obj, trio\trio.lib as well as shell32.lib * tests/spawn-test.c : include <io.h> on win32
This commit is contained in:
parent
66d742f8cf
commit
2781d5f6b3
17
ChangeLog
17
ChangeLog
@ -1,3 +1,20 @@
|
||||
2003-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/trio/makefile.msc : (new file) for msvc build
|
||||
|
||||
* glib/glib.def : removed some duplicated entries
|
||||
|
||||
* glib/gscanner.c : add same workaround for MSVC(5.0)
|
||||
which does not allow to cast an uint64 to float.
|
||||
Same as in gvaluetransform.c
|
||||
Also move #include <io.h> behind inclusion of "glib.h"
|
||||
which defines the needed G_OS_WIN32
|
||||
|
||||
* glib/makefile.msc.in : added gprintf.obj, trio\trio.lib
|
||||
as well as shell32.lib
|
||||
|
||||
* tests/spawn-test.c : include <io.h> on win32
|
||||
|
||||
2003-07-12 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gprintf.c: Doc additions.
|
||||
|
@ -1,3 +1,20 @@
|
||||
2003-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/trio/makefile.msc : (new file) for msvc build
|
||||
|
||||
* glib/glib.def : removed some duplicated entries
|
||||
|
||||
* glib/gscanner.c : add same workaround for MSVC(5.0)
|
||||
which does not allow to cast an uint64 to float.
|
||||
Same as in gvaluetransform.c
|
||||
Also move #include <io.h> behind inclusion of "glib.h"
|
||||
which defines the needed G_OS_WIN32
|
||||
|
||||
* glib/makefile.msc.in : added gprintf.obj, trio\trio.lib
|
||||
as well as shell32.lib
|
||||
|
||||
* tests/spawn-test.c : include <io.h> on win32
|
||||
|
||||
2003-07-12 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gprintf.c: Doc additions.
|
||||
|
@ -1,3 +1,20 @@
|
||||
2003-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/trio/makefile.msc : (new file) for msvc build
|
||||
|
||||
* glib/glib.def : removed some duplicated entries
|
||||
|
||||
* glib/gscanner.c : add same workaround for MSVC(5.0)
|
||||
which does not allow to cast an uint64 to float.
|
||||
Same as in gvaluetransform.c
|
||||
Also move #include <io.h> behind inclusion of "glib.h"
|
||||
which defines the needed G_OS_WIN32
|
||||
|
||||
* glib/makefile.msc.in : added gprintf.obj, trio\trio.lib
|
||||
as well as shell32.lib
|
||||
|
||||
* tests/spawn-test.c : include <io.h> on win32
|
||||
|
||||
2003-07-12 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gprintf.c: Doc additions.
|
||||
|
@ -1,3 +1,20 @@
|
||||
2003-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/trio/makefile.msc : (new file) for msvc build
|
||||
|
||||
* glib/glib.def : removed some duplicated entries
|
||||
|
||||
* glib/gscanner.c : add same workaround for MSVC(5.0)
|
||||
which does not allow to cast an uint64 to float.
|
||||
Same as in gvaluetransform.c
|
||||
Also move #include <io.h> behind inclusion of "glib.h"
|
||||
which defines the needed G_OS_WIN32
|
||||
|
||||
* glib/makefile.msc.in : added gprintf.obj, trio\trio.lib
|
||||
as well as shell32.lib
|
||||
|
||||
* tests/spawn-test.c : include <io.h> on win32
|
||||
|
||||
2003-07-12 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gprintf.c: Doc additions.
|
||||
|
@ -1,3 +1,20 @@
|
||||
2003-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/trio/makefile.msc : (new file) for msvc build
|
||||
|
||||
* glib/glib.def : removed some duplicated entries
|
||||
|
||||
* glib/gscanner.c : add same workaround for MSVC(5.0)
|
||||
which does not allow to cast an uint64 to float.
|
||||
Same as in gvaluetransform.c
|
||||
Also move #include <io.h> behind inclusion of "glib.h"
|
||||
which defines the needed G_OS_WIN32
|
||||
|
||||
* glib/makefile.msc.in : added gprintf.obj, trio\trio.lib
|
||||
as well as shell32.lib
|
||||
|
||||
* tests/spawn-test.c : include <io.h> on win32
|
||||
|
||||
2003-07-12 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gprintf.c: Doc additions.
|
||||
|
@ -1,3 +1,20 @@
|
||||
2003-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/trio/makefile.msc : (new file) for msvc build
|
||||
|
||||
* glib/glib.def : removed some duplicated entries
|
||||
|
||||
* glib/gscanner.c : add same workaround for MSVC(5.0)
|
||||
which does not allow to cast an uint64 to float.
|
||||
Same as in gvaluetransform.c
|
||||
Also move #include <io.h> behind inclusion of "glib.h"
|
||||
which defines the needed G_OS_WIN32
|
||||
|
||||
* glib/makefile.msc.in : added gprintf.obj, trio\trio.lib
|
||||
as well as shell32.lib
|
||||
|
||||
* tests/spawn-test.c : include <io.h> on win32
|
||||
|
||||
2003-07-12 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gprintf.c: Doc additions.
|
||||
|
@ -516,7 +516,6 @@ EXPORTS
|
||||
g_slist_sort
|
||||
g_slist_sort_with_data
|
||||
g_snprintf
|
||||
g_snprintf
|
||||
g_source_add_poll
|
||||
g_source_attach
|
||||
g_source_destroy
|
||||
@ -746,7 +745,6 @@ EXPORTS
|
||||
g_vfprintf
|
||||
g_vprintf
|
||||
g_vsnprintf
|
||||
g_vsnprintf
|
||||
g_vsprintf
|
||||
g_win32_error_message
|
||||
g_win32_ftruncate
|
||||
|
@ -41,13 +41,14 @@
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#ifdef G_OS_WIN32
|
||||
#include <io.h> /* For _read() */
|
||||
#endif
|
||||
|
||||
#include "glib.h"
|
||||
#include "gprintfint.h"
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <io.h> /* For _read() */
|
||||
#endif
|
||||
|
||||
/* --- defines --- */
|
||||
#define to_lower(c) ( \
|
||||
(guchar) ( \
|
||||
@ -1194,7 +1195,14 @@ g_scanner_get_token_i (GScanner *scanner,
|
||||
{
|
||||
*token_p = G_TOKEN_FLOAT;
|
||||
if (scanner->config->store_int64)
|
||||
value_p->v_float = value_p->v_int64;
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
/* work around error C2520, see gvaluetransform.c */
|
||||
value_p->v_float = (__int64)value_p->v_int64;
|
||||
#else
|
||||
value_p->v_float = value_p->v_int64;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
value_p->v_float = value_p->v_int;
|
||||
}
|
||||
|
@ -14,10 +14,17 @@ DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(LIBICONV_CFLAGS) $(DIRENT_CFLAGS)
|
||||
all : \
|
||||
..\config.h \
|
||||
..\glibconfig.h \
|
||||
trio\trio.lib \
|
||||
libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll \
|
||||
glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
|
||||
gspawn-win32-helper.exe \
|
||||
|
||||
|
||||
trio\trio.lib :
|
||||
cd trio
|
||||
nmake -f makefile.msc
|
||||
cd ..
|
||||
|
||||
glib_OBJECTS = \
|
||||
garray.obj \
|
||||
gasyncqueue.obj \
|
||||
@ -42,9 +49,11 @@ glib_OBJECTS = \
|
||||
gmessages.obj \
|
||||
gnode.obj \
|
||||
gprimes.obj \
|
||||
gprintf.obj \
|
||||
gqsort.obj \
|
||||
gqueue.obj \
|
||||
gpattern.obj \
|
||||
gprintf.obj \
|
||||
grand.obj \
|
||||
grel.obj \
|
||||
gscanner.obj \
|
||||
@ -79,11 +88,12 @@ localcharset.c : libcharset/localcharset.c
|
||||
|
||||
# create a static libary
|
||||
# static library can well have the real version number in the name
|
||||
glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS)
|
||||
lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS)
|
||||
glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS) trio\trio.lib
|
||||
lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) trio\trio.lib
|
||||
|
||||
libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) glib.def
|
||||
$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) $(DIRENT_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
|
||||
$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) \
|
||||
trio\trio.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
|
||||
|
||||
gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
|
||||
$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib
|
||||
|
@ -34,6 +34,7 @@
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <fcntl.h>
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user