glib r7667 - in branches/glib-2-18/gio: . win32
- From: hans svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r7667 - in branches/glib-2-18/gio: . win32
- Date: Sun, 23 Nov 2008 11:57:58 +0000 (UTC)
Author: hans
Date: Sun Nov 23 11:57:57 2008
New Revision: 7667
URL: http://svn.gnome.org/viewvc/glib?rev=7667&view=rev
Log:
2008-11-23 Hans Breuer <hans breuer org>
* gio.rc.in : version resource as for the other glib dlls
* win32/makefile.msc win32/Makefile.am : added, EXTRA_DIST
* makefile.msc : updated
Added:
branches/glib-2-18/gio/gio.rc.in
branches/glib-2-18/gio/win32/makefile.msc (contents, props changed)
Modified:
branches/glib-2-18/gio/ChangeLog
branches/glib-2-18/gio/makefile.msc
branches/glib-2-18/gio/win32/Makefile.am
Added: branches/glib-2-18/gio/gio.rc.in
==============================================================================
--- (empty file)
+++ branches/glib-2-18/gio/gio.rc.in Sun Nov 23 11:57:57 2008
@@ -0,0 +1,30 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,0
+ PRODUCTVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,0
+ FILEFLAGSMASK 0
+ FILEFLAGS 0
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "CompanyName", "The GLib developer community"
+ VALUE "FileDescription", "Gio"
+ VALUE "FileVersion", "@GLIB_VERSION 0"
+ VALUE "InternalName", "libgio-2 0- LT_CURRENT_MINUS_AGE@"
+ VALUE "LegalCopyright", "Copyright © 2006-2007 Red Hat, Inc. Modified by the GLib Team and others 2006-2008."
+ VALUE "OriginalFilename", "libgio-2 0- LT_CURRENT_MINUS_AGE@.dll"
+ VALUE "ProductName", "GLib"
+ VALUE "ProductVersion", "@GLIB_VERSION@"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+ END
Modified: branches/glib-2-18/gio/makefile.msc
==============================================================================
--- branches/glib-2-18/gio/makefile.msc (original)
+++ branches/glib-2-18/gio/makefile.msc Sun Nov 23 11:57:57 2008
@@ -5,7 +5,7 @@
PKG_VER = 2.0
!INCLUDE $(TOP)\glib\build\win32\make.msc
-# SUBDIRS = fam
+SUBDIRS = win32
sub-all:
for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
@@ -38,6 +38,7 @@
gdatainputstream.h \
gdataoutputstream.h \
gdrive.h \
+ gemblem.h \
gemblemedicon.h \
gfile.h \
gfileattribute.h \
@@ -86,6 +87,7 @@
# gdesktopappinfo.obj \
gdrive.obj \
gdummyfile.obj \
+ gemblem.obj \
gemblemedicon.obj \
gfile.obj \
gfileattribute.obj \
@@ -133,7 +135,6 @@
gwin32appinfo.obj \
\
gio-marshal.obj \
- gwin32directorymonitor.obj \
gwin32mount.obj \
# gwin32volume.obj \
gwin32volumemonitor.obj
@@ -159,39 +160,9 @@
gunixvolumemonitor.h \
$(NULL)
-NULL = \
-
-
-libgio_2_0_la_LDFLAG = \
- -export-dynamic \
- $(no_undefined) \
- -export-symbols-regex \
- '^g_.*'
-
-giounixincludedi = \
- $(includedir)/gio-unix-2.0/gio
-
-platform_libadd = \
- -lshlwapi
-
marshal_sources = \
gio-marshal.h gio-marshal.c $(NULL)
-gioincludedi = \
- $(includedir)/glib-2.0/gio/
-
-EXTRA_DIST = \
- gio-marshal.list $(NULL)
-
-CLEANFILES = \
- $(marshal_sources) $(NULL)
-
-no_undefined = \
- -no-undefined
-
-giounixinclude_HEADERS = \
- gunixmounts.h $(NULL)
-
GLIB_GEN_MARSHAL = ..\gobject\glib-genmarshal.exe
gio-marshal.h: gio-marshal.list
@@ -226,12 +197,13 @@
all : \
$(PRJ_TOP)\config.h \
+ sub-all \
gioalias.h \
gioaliasdef.c \
gio-marshal.c \
gioenumtypes.h \
gioenumtypes.c \
- libgio-$(PKG_VER).dll
+ libgio-$(PKG_VER)-0.dll
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
@@ -255,14 +227,15 @@
-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
-DG_GNUC_PRINTF=;G_GNUC_PRINTF gio.symbols >> gio.def
-gwin32directorymonitor.obj : win32\gwin32directorymonitor.c
- $(CC) $(CFLAGS) -I win32 -c win32\gwin32directorymonitor.c
-
RESOURCE = $(PACKAGE).res
-libgio-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
- $(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER).dll $(OBJECTS) \
+$(PACKAGE).res : $(PACKAGE).rc
+ rc -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc
+
+libgio-$(PKG_VER)-0.dll : $(OBJECTS) $(PACKAGE).def $(RESOURCE)
+ $(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER)-0.dll $(OBJECTS) $(RESOURCE) \
..\glib\glib-2.0.lib ..\gobject\gobject-2.0.lib ..\gmodule\gmodule-2.0.lib \
+ win32\giowin32.lib \
$(INTL_LIBS) \
kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib mpr.lib $(LDFLAGS) \
/implib:gio-2.0.lib /def:$(PACKAGE).def
Modified: branches/glib-2-18/gio/win32/Makefile.am
==============================================================================
--- branches/glib-2-18/gio/win32/Makefile.am (original)
+++ branches/glib-2-18/gio/win32/Makefile.am Sun Nov 23 11:57:57 2008
@@ -28,3 +28,6 @@
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGIO_COMPILATION \
-DG_DISABLE_DEPRECATED
+
+EXTRA_DIST += \
+ makefile.msc
Added: branches/glib-2-18/gio/win32/makefile.msc
==============================================================================
--- (empty file)
+++ branches/glib-2-18/gio/win32/makefile.msc Sun Nov 23 11:57:57 2008
@@ -0,0 +1,35 @@
+TOP = ..\..\..
+PRJ_TOP = ..\..
+PACKAGE = giowin32
+PKG_VER = 2.0
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+INCLUDES = \
+ -FImsvc_recommended_pragmas.h \
+ -I .. -I ..\.. -I ..\..\glib -I ..\..\gmodule -I . \
+ $(INTL_CFLAGS)
+
+DEFINES = \
+ -DG_LOG_DOMAIN=\"GLib-GIO\" \
+ -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \
+ -DGIO_COMPILATION
+
+OBJECTS = \
+ gwin32directorymonitor.obj \
+ gwinhttpfile.obj \
+ gwinhttpfileinputstream.obj \
+ gwinhttpfileoutputstream.obj \
+ gwinhttpvfs.obj \
+
+all : \
+ $(PRJ_TOP)\config.h \
+ $(PACKAGE).lib
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+ copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+$(PACKAGE).lib : $(OBJECTS)
+ lib /out:$(PACKAGE).lib $(OBJECTS)
+
+.c.obj :
+ $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]