mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-09 16:57:36 +00:00
Brought up to date with Makefile.in in browser/app
This commit is contained in:
parent
800ca4022e
commit
dee7b5b5f4
@ -67,7 +67,7 @@ ifdef BUILD_STATIC_LIBS
|
||||
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
TK_LIBS := -framework Cocoa $(TK_LIBS)
|
||||
endif
|
||||
|
||||
@ -98,6 +98,8 @@ MOZ_WINCONSOLE = 0
|
||||
endif
|
||||
endif
|
||||
|
||||
NSDISTMODE = copy
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
ifndef BUILD_STATIC_LIBS
|
||||
|
||||
@ -163,6 +165,9 @@ endif
|
||||
APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
|
||||
DEFINES += -DAPP_VERSION=\"$(APP_VERSION)\"
|
||||
|
||||
BUILD_ID = $(shell cat $(DEPTH)/config/build_number)
|
||||
DEFINES += -DBUILD_ID=\"$(BUILD_ID)\"
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
LIBS += -framework QuickTime -framework IOKit
|
||||
|
Loading…
x
Reference in New Issue
Block a user