Revision: 5976 Author: [email protected] Date: Tue Aug 18 15:58:15 2009 Log: Makefile changes necessary to build on MacOSX 10.4.
http://code.google.com/p/google-web-toolkit/source/detail?r=5976 Modified: /trunk/plugins/config.mk /trunk/plugins/xpcom/Makefile ======================================= --- /trunk/plugins/config.mk Wed Aug 5 23:05:01 2009 +++ /trunk/plugins/config.mk Tue Aug 18 15:58:15 2009 @@ -34,27 +34,38 @@ # Figure out 64-bit platforms, canonicalize ARCH and MARCH ifeq ($(ARCH),x86_64) FLAG32BIT=64 -else ifeq ($(ARCH),sparc) +endif +ifeq ($(ARCH),sparc) FLAG32BIT=64 -else ifeq ($(ARCH),alpha) +endif +ifeq ($(ARCH),alpha) FLAG32BIT=64 -else ifeq ($(ARCH),ia64) +endif +ifeq ($(ARCH),ia64) FLAG32BIT=64 -else ifeq ($(ARCH),athlon) +endif +ifeq ($(ARCH),athlon) ARCH=x86 -else ifeq ($(ARCH),i386) +endif +ifeq ($(ARCH),i386) ARCH=x86 -else ifeq ($(ARCH),i486) +endif +ifeq ($(ARCH),i486) ARCH=x86 -else ifeq ($(ARCH),i586) +endif +ifeq ($(ARCH),i586) ARCH=x86 -else ifeq ($(ARCH),i686) +endif +ifeq ($(ARCH),i686) ARCH=x86 -else ifeq ($(ARCH),i86pc) +endif +ifeq ($(ARCH),i86pc) ARCH=x86 -else ifeq ($(ARCH),Macintosh) +endif +ifeq ($(ARCH),Macintosh) ARCH=ppc endif + MARCH=$(ARCH) ifeq ($(ARCH),x86) MARCH=i386 @@ -64,12 +75,14 @@ ifeq ($(shell uname),Linux) OS=linux CFLAGS= -g -O2 -fPIC $(INC) -rdynamic -m$(FLAG32BIT) -else ifeq ($(shell uname),Darwin) +endif +ifeq ($(shell uname),Darwin) OS=mac CFLAGS= -g -O2 -fPIC $(INC) -D__mac -arch $(MARCH) AR=libtool ARFLAGS=-static -o -else ifeq ($(shell uname),SunOS) +endif +ifeq ($(shell uname),SunOS) OS=sun #CFLAGS=-fast -g0 -Kpic $(INC) -Bdynamic -noex # SunC appears to miscompile Socket::writeByte by not incrementing the ======================================= --- /trunk/plugins/xpcom/Makefile Wed Aug 5 23:05:01 2009 +++ /trunk/plugins/xpcom/Makefile Tue Aug 18 15:58:15 2009 @@ -28,17 +28,21 @@ TARGET_PLATFORM = Darwin_x86-gcc3 # Mac puts multiple architectures into the same files GECKO_PLATFORM = Darwin-gcc3 -else ifeq ($(OS),linux) +else +ifeq ($(OS),linux) DEFAULT_FIREFOX_LIBS ?= /usr/lib/firefox RUN_PATH_FLAG = -rpath-link DLL_SUFFIX = .so DLLFLAGS = -shared -m$(FLAG32BIT) TARGET_PLATFORM = Linux_$(ARCH)-gcc3 -else ifeq ($(OS),sun) +else +ifeq ($(OS),sun) TARGET_PLATFORM = SunOS_$(ARCH)-sunc RUN_PATH_FLAG = -rpath-link DLLFLAGS= endif +endif +endif export FLAG32BIT @@ -51,19 +55,25 @@ ifeq ($(BROWSER),ff2) BROWSER_VERSION = 1.8 CFLAGS += -DBROWSER_FF2 -else ifeq ($(BROWSER),ff3) +else +ifeq ($(BROWSER),ff3) BROWSER_VERSION = 1.9.0 CFLAGS += -DBROWSER_FF3 -else ifeq ($(BROWSER),ff3+) +else +ifeq ($(BROWSER),ff3+) BROWSER_VERSION = 1.9.0 CFLAGS += -DBROWSER_FF3 GECKO_MINOR_VERSION=.10 -else ifeq ($(BROWSER),ff35) +else +ifeq ($(BROWSER),ff35) BROWSER_VERSION = 1.9.1 CFLAGS += -DBROWSER_FF3 else $(error Unrecognized BROWSER of $(BROWSER) - options are ff2, ff3, ff3+, ff35) endif +endif +endif +endif CFLAGS += -fshort-wchar CXXFLAGS = $(CXXONLYFLAGS) $(CFLAGS) @@ -98,11 +108,12 @@ # -L$(GECKO_LIBS) \ # -L$(FIREFOX_LIBS) \ # -Wl,$(RUN_PATH_FLAG),$(FIREFOX_LIBS) \ +# -Wl,$(RUN_PATH_FLAG),$(GECKO_LIBS) \ +# -Wl,$(RUN_PATH_FLAG),$(DEFAULT_FIREFOX_LIBS) \ # -lxpcomglue_s -lxpcom -lnspr4 -lmozjs DLLFLAGS += \ -L$(DEFAULT_FIREFOX_LIBS) \ -L$(GECKO_LIBS) \ - -Wl,$(RUN_PATH_FLAG),$(DEFAULT_FIREFOX_LIBS) \ -Wl,$(RUN_PATH_FLAG),$(GECKO_LIBS) \ -lxpcomglue_s -lxpcom -lnspr4 -lmozjs --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
