322578 Support ppc<->x86 cross builds for Mac OS X. Remove asdecode. Building on Jaguar is no longer supported, although running on Jaguar still is. r=josh sr=pink a/1.8=josh a/1.8.0=dveditz
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@190528 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -349,7 +349,7 @@
|
||||
};
|
||||
F5E0C34D036A12DF01A96660 = {
|
||||
isa = PBXFileReference;
|
||||
path = _NullPlugin.rsrc;
|
||||
path = NullPlugin.rsrc;
|
||||
refType = 2;
|
||||
};
|
||||
F5E0C34E036A12DF01A96660 = {
|
||||
|
||||
@@ -343,7 +343,7 @@
|
||||
F5E0C34D036A12DF01A96660 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = file;
|
||||
path = _NullPlugin.rsrc;
|
||||
path = NullPlugin.rsrc;
|
||||
refType = 2;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
|
||||
@@ -76,10 +76,6 @@ PACKAGE_FILE = npnul.pkg
|
||||
|
||||
unexport CC CXX
|
||||
|
||||
# decodes resource files from AppleSingle to Resource Manager format.
|
||||
ASDECODE = $(DIST)/bin/asdecode
|
||||
RESOURCE_FILES = _NullPlugin.rsrc
|
||||
|
||||
# for objdir builds, copy the project, and symlink the sources
|
||||
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
|
||||
ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
|
||||
@@ -90,6 +86,7 @@ export::
|
||||
ln -fs $(srcdir)/NullPlugin.cpp
|
||||
ln -fs $(srcdir)/npmac.cpp
|
||||
ln -fs $(srcdir)/Info-*.plist .
|
||||
ln -fs $(srcdir)/NullPlugin.rsrc
|
||||
endif
|
||||
|
||||
libs install:: install-plugin
|
||||
@@ -97,15 +94,9 @@ libs install:: install-plugin
|
||||
install-plugin: build-plugin
|
||||
$(INSTALL) "$(XCODE_PRODUCT_DIR)/Default Plugin.plugin" $(DIST)/bin/plugins
|
||||
|
||||
resources: $(RESOURCE_FILES)
|
||||
|
||||
build-plugin: resources
|
||||
build-plugin:
|
||||
$(PBBUILD) $(PROJECT_ARG) -target $(TARGET) -buildstyle $(BUILDSTYLE) $(PBBUILD_ARG)
|
||||
echo -n NSPLMOSS > "$(XCODE_PRODUCT_DIR)/Default Plugin.plugin/Contents/PkgInfo"
|
||||
|
||||
_%.rsrc: %.rsrc
|
||||
$(ASDECODE) $< $@
|
||||
|
||||
clean clobber distclean::
|
||||
rm -f $(RESOURCE_FILES)
|
||||
rm -rf build
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.8 KiB |
Reference in New Issue
Block a user