зеркало из https://github.com/mozilla/gecko-dev.git
bug 1223529 - remove ipc/chromium/Makefile.in. r=gps
--HG-- extra : commitid : H9gHRycMIGd extra : rebase_source : 0f96f1f1eb9ddea4ba1310637d6ff36312fc3030
This commit is contained in:
Родитель
737a624570
Коммит
288258a78d
|
@ -1,40 +0,0 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
|
||||
|
||||
ACDEFINES =
|
||||
|
||||
ifndef MOZ_NATIVE_LIBEVENT # {
|
||||
vpath %.c \
|
||||
$(srcdir)/src/third_party/libevent \
|
||||
$(NULL)
|
||||
endif # }
|
||||
|
||||
vpath %.cc \
|
||||
$(srcdir)/src/base \
|
||||
$(srcdir)/src/chrome/common \
|
||||
$(NULL)
|
||||
|
||||
vpath %.mm \
|
||||
$(srcdir)/src/base \
|
||||
$(srcdir)/src/chrome/common \
|
||||
$(NULL)
|
||||
|
||||
OS_CXXFLAGS += $(TK_CFLAGS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef MOZ_NATIVE_LIBEVENT # {
|
||||
|
||||
export-preqs = \
|
||||
$(call mkdir_deps,$(CURDIR)/third_party/libevent) \
|
||||
$(NULL)
|
||||
|
||||
export:: $(DIST)/third_party/libevent/event.h
|
||||
|
||||
$(DIST)/third_party/libevent/event.h:: $(export-preqs)
|
||||
echo '#include <event.h>' > $(CURDIR)/third_party/libevent/event.h
|
||||
|
||||
endif # }
|
|
@ -167,6 +167,8 @@ if '86' not in ost and 'arm' not in ost and 'mips' not in ost:
|
|||
'src/base/atomicops_internals_mutex.cc',
|
||||
]
|
||||
|
||||
CXXFLAGS += CONFIG['TK_CFLAGS']
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include "base/scoped_nsautorelease_pool.h"
|
||||
#include "base/time.h"
|
||||
#include "nsDependentSubstring.h"
|
||||
#include "third_party/libevent/event.h"
|
||||
#include "event.h"
|
||||
#include "mozilla/UniquePtr.h"
|
||||
|
||||
// This macro checks that the _EVENT_SIZEOF_* constants defined in
|
||||
|
|
Загрузка…
Ссылка в новой задаче