diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 15:33:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 15:33:15 +0100 |
| commit | 372199d4f1cf223f167bdaa5e6d55ce0268c0970 (patch) | |
| tree | f23f7ce8306cd8d0fe63c9d43795d8b5809b762a /glib | |
| parent | 8bbf048085066b8e95256e7d59d7ddd89465d4e7 (diff) | |
Make some --without-system-XXX available on Linux, too
...in case that should ever become uesful.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/makefile.mk | 24 | ||||
| -rw-r--r-- | glib/prj/d.lst | 10 |
2 files changed, 25 insertions, 9 deletions
diff --git a/glib/makefile.mk b/glib/makefile.mk index 1b31d395eab6..0efb7ec3b665 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -48,7 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(GLIBVERSION) TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e -.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS" +.IF "$(OS)"!="WNT" PATCH_FILES=glib-2.28.1.patch glib-2.28.1.noise.patch .IF "$(OS)"=="IOS" @@ -91,21 +91,27 @@ VFLAG=V=1 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) -j$(MAXPROCESS) -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"!="IOS" EXTRPATH=LOADER -OUT2LIB+=gio/.libs/libgio-2.0.0.dylib -OUT2LIB+=glib/.libs/libglib-2.0.0.dylib -OUT2LIB+=gmodule/.libs/libgmodule-2.0.0.dylib -OUT2LIB+=gobject/.libs/libgobject-2.0.0.dylib -OUT2LIB+=gthread/.libs/libgthread-2.0.0.dylib +.IF "$(OS)" == "MACOSX" +my_ext = .0$(DLLPOST) +.ELSE +my_ext = $(DLLPOST).0 +.END + +OUT2LIB+=gio/.libs/libgio-2.0$(my_ext) +OUT2LIB+=glib/.libs/libglib-2.0$(my_ext) +OUT2LIB+=gmodule/.libs/libgmodule-2.0$(my_ext) +OUT2LIB+=gobject/.libs/libgobject-2.0$(my_ext) +OUT2LIB+=gthread/.libs/libgthread-2.0$(my_ext) OUT2BIN+=gobject/glib-mkenums OUT2BIN+=gobject/.libs/glib-genmarshal OUT2BIN+=gio/.libs/glib-compile-schemas -.ELIF "$(OS)"=="IOS" +.ELSE OUT2LIB+=gio/.libs/libgio-2.0.a OUT2LIB+=glib/.libs/libglib-2.0.a @@ -115,7 +121,7 @@ OUT2LIB+=gthread/.libs/libgthread-2.0.a .ENDIF -.ELIF "$(OS)"=="WNT" +.ELSE CONVERTFILES=gobject/gmarshal.c diff --git a/glib/prj/d.lst b/glib/prj/d.lst index 751d5c65b295..7e4ab84c5199 100644 --- a/glib/prj/d.lst +++ b/glib/prj/d.lst @@ -9,6 +9,16 @@ symlink: %_DEST%\lib\libgthread-2.0.0.dylib %_DEST%\lib\libgthread-2.0.dylib symlink: %_DEST%\lib\libglib-2.0.0.dylib %_DEST%\lib\libglib-2.0.dylib ..\%__SRC%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.0.dylib symlink: %_DEST%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.dylib +..\%__SRC%\lib\libgio-2.0.so.0 %_DEST%\lib\libgio-2.0.so.0 +symlink: %_DEST%\lib\libgio-2.0.so.0 %_DEST%\lib\libgio-2.0.so +..\%__SRC%\lib\libgmodule-2.0.so.0 %_DEST%\lib\libgmodule-2.0.so.0 +symlink: %_DEST%\lib\libgmodule-2.0.so.0 %_DEST%\lib\libgmodule-2.0.so +..\%__SRC%\lib\libgthread-2.0.so.0 %_DEST%\lib\libgthread-2.0.so.0 +symlink: %_DEST%\lib\libgthread-2.0.so.0 %_DEST%\lib\libgthread-2.0.so +..\%__SRC%\lib\libglib-2.0.so.0 %_DEST%\lib\libglib-2.0.so.0 +symlink: %_DEST%\lib\libglib-2.0.so.0 %_DEST%\lib\libglib-2.0.so +..\%__SRC%\lib\libgobject-2.0.so.0 %_DEST%\lib\libgobject-2.0.so.0 +symlink: %_DEST%\lib\libgobject-2.0.so.0 %_DEST%\lib\libgobject-2.0.so ..\%__SRC%\bin\*.dll %_DEST%\bin ..\%__SRC%\bin\glib-mkenums %_DEST%\bin\glib-mkenums ..\%__SRC%\bin\glib-genmarshal %_DEST%\bin\glib-genmarshal |