X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fmakefile.msc.in;h=e45b1e510a926b35695c053ba94c2dd7db0627c7;hb=d0083f7e2dd621c6b78496bdb6ecf5d580c5e110;hp=a0c75b0c5394a662b46018e1e800194e3abaca6a;hpb=aa410edee6042a526559f0c534072013252cce52;p=platform%2Fupstream%2Fglib.git

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index a0c75b0..e45b1e5 100644
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -8,16 +8,22 @@ TOP = ..\..
 ################################################################
 
 INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ..
-DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" -DG_ENABLE_DEBUG
-DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(LIBICONV_CFLAGS) $(DIRENT_CFLAGS)
+DEFINES = \
+	-DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" \
+	-DG_ENABLE_DEBUG -DPCRE_STATIC -DG_DISABLE_DEPRECATED \
+	-DDLL_EXPORT=1
+
+DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(DIRENT_CFLAGS)
 
 all :				\
 	..\config.h		\
 	..\glibconfig.h	\
 	gnulib\gnulib.lib	\
-	libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll \
+	pcre\pcre.lib		\
+	libglib-2.0-0.dll \
 	glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
 	gspawn-win32-helper.exe	\
+	gspawn-win32-helper-console.exe	\
 
 
 gnulib\gnulib.lib :
@@ -25,53 +31,69 @@ gnulib\gnulib.lib :
 	nmake -f makefile.msc
 	cd ..
 
+pcre\pcre.lib :
+	cd pcre
+	nmake -f makefile.msc
+	cd ..
+
 glib_OBJECTS =			\
 	garray.obj		\
 	gasyncqueue.obj		\
 	gatomic.obj	\
 	gbacktrace.obj		\
-	gcache.obj		\
-	gcompletion.obj		\
-	gconvert.obj		\
-	gdataset.obj		\
-	gdate.obj		\
-	gdir.obj	\
-	gerror.obj		\
-	gfileutils.obj		\
-	ghash.obj		\
-	ghook.obj		\
-	gkeyfile.obj		\
-	giochannel.obj		\
-	giowin32.obj		\
-	glist.obj		\
-	gmain.obj		\
-	gmarkup.obj		\
-	gmem.obj		\
-	gmessages.obj		\
-	gnode.obj		\
-	goption.obj	\
-	gprimes.obj		\
-	gqsort.obj		\
-	gqueue.obj		\
-	gpattern.obj	\
-	gprintf.obj	\
-	grand.obj		\
-	grel.obj		\
-	gscanner.obj		\
-	gshell.obj		\
-	gslist.obj		\
-	gspawn-win32.obj	\
-	gstdio.obj	\
-	gstrfuncs.obj		\
-	gstring.obj		\
-	gthread.obj		\
-	gthreadpool.obj		\
-	gtimer.obj		\
-	gtree.obj		\
-	gunibreak.obj		\
-	gunicollate.obj		\
-	gunidecomp.obj		\
-	guniprop.obj		\
+	gbase64.obj	\
+	gbookmarkfile.obj \
+	gcache.obj \
+	gchecksum.obj	\
+	gcompletion.obj	\
+	gconvert.obj \
+	gdataset.obj \
+	gdate.obj \
+	gdir.obj \
+	gerror.obj \
+	gfileutils.obj \
+	ghash.obj \
+	ghostutils.obj \
+	ghook.obj \
+	giochannel.obj \
+	giowin32.obj \
+	gpoll.obj \
+	gkeyfile.obj \
+	glist.obj \
+	gmain.obj \
+	gmappedfile.obj	\
+	gmarkup.obj \
+	gmem.obj \
+	gmessages.obj \
+	gnode.obj \
+	goption.obj \
+	gpattern.obj \
+	gprimes.obj \
+	gprintf.obj \
+	gqsort.obj \
+	gqueue.obj \
+	grand.obj \
+	gregex.obj \
+	grel.obj \
+	gscanner.obj \
+	gsequence.obj \
+	gshell.obj \
+	gslice.obj \
+	gslist.obj \
+	gspawn-win32.obj \
+	gstdio.obj \
+	gstrfuncs.obj \
+	gstring.obj \
+	gtestutils.obj \
+	gthread.obj \
+	gthreadpool.obj \
+	gtimer.obj \
+	gtree.obj \
+	gunibreak.obj \
+	gunicollate.obj \
+	gunidecomp.obj \
+	guniprop.obj \
+	gurifuncs.obj \
 	gutf8.obj		\
 	gutils.obj		\
 	gwin32.obj		\
@@ -83,15 +105,14 @@ glib_OBJECTS =			\
 ..\config.h: ..\config.h.win32
 	copy ..\config.h.win32 ..\config.h
 
-galias.h: glib.symbols
-	perl makegalias.pl < glib.symbols > galias.h
-
-localcharset.c : libcharset/localcharset.c
-	copy libcharset\localcharset.c localcharset.c
+localcharset.obj : libcharset\localcharset.c
+	$(CC) $(CFLAGS) -DLIBDIR=\".\" -c libcharset\localcharset.c
 
 glib.def: glib.symbols
 	echo EXPORTS > glib.def
-	cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS glib.symbols >> glib.def
+	cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \
+		-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
+		-DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT glib.symbols >> glib.def
 
 glib.res : glib.rc
 	rc -DBUILDNUMBER=0 -r -fo glib.res glib.rc
@@ -100,16 +121,20 @@ glib.res : glib.rc
 
 # 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) gnulib\gnulib.lib
-	lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) gnulib\gnulib.lib
+glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib
+	lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib
 
-libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) gnulib\gnulib.lib glib.def glib.res
-	$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(LIBICONV_LIBS) $(INTL_LIBS) \
-	gnulib\gnulib.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
+libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res
+	$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(INTL_LIBS) \
+	gnulib\gnulib.lib pcre\pcre.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib ws2_32.lib winmm.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
 
+gspawn-win32-helper-console.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:console user32.lib
+
 ################ other stuff
 
 clean::