Revision: 5894 Author: [email protected] Date: Wed Aug 5 18:39:55 2009 Log: Makefile changes to support Mac builds.
Patch by: sgross Review by: jat http://code.google.com/p/google-web-toolkit/source/detail?r=5894 Modified: /trunk/plugins/config.mk /trunk/plugins/xpcom/Makefile ======================================= --- /trunk/plugins/config.mk Mon Aug 3 08:30:11 2009 +++ /trunk/plugins/config.mk Wed Aug 5 18:39:55 2009 @@ -66,7 +66,7 @@ CFLAGS= -g -O2 -fPIC $(INC) -rdynamic -m$(FLAG32BIT) else ifeq ($(shell uname),Darwin) OS=mac -CFLAGS= -g -O2 -fPIC $(INC) -D__mac -arch $(MARCH) +CFLAGS= -g -O2 -fPIC $(INC) -D__mac -arch i386 -arch ppc AR=libtool ARFLAGS=-static -o else ifeq ($(shell uname),SunOS) ======================================= --- /trunk/plugins/xpcom/Makefile Mon Aug 3 08:30:11 2009 +++ /trunk/plugins/xpcom/Makefile Wed Aug 5 18:39:55 2009 @@ -14,22 +14,18 @@ include ../config.mk -# Make variables intended to be settable fromthe command line: -# DEFAULT_FIREFOX_LIBS points to /usr/lib/firefox or equivalent +# Make variables intended to be settable from the command line: # PLUGIN_SDKS points to GWT /plugin-sdks directory # GECKO_PLATFORM XPCOM ABI (ie, Linux_x86_64-gcc3) # ifeq ($(OS),mac) -DEFAULT_FIREFOX_LIBS ?= /Applications/Firefox.app/Contents/MacOS RUN_PATH_FLAG = -executable_path DLL_SUFFIX = .dylib DLLFLAGS = -bundle -arch i386 -arch ppc -TARGET_PLATFORM = Darwin_x86-gcc3 # Mac puts multiple architectures into the same files -GECKO_PLATFORM = Darwin-gcc3 +TARGET_PLATFORM = Darwin-gcc3 else ifeq ($(OS),linux) -DEFAULT_FIREFOX_LIBS ?= /usr/lib/firefox RUN_PATH_FLAG = -rpath-link DLL_SUFFIX = .so DLLFLAGS = -shared -m$(FLAG32BIT) @@ -100,9 +96,7 @@ # -Wl,$(RUN_PATH_FLAG),$(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 -~----------~----~----~----~------~----~------~--~---
