Fix up static build some more (and remove extraneous framework path into sdagley's home directory).
This commit is contained in:
bryner%netscape.com
Родитель
66fa5a8d6e
Коммит
8c16915a74
|
|
@ -903,6 +903,18 @@
|
|||
//A72
|
||||
//A73
|
||||
//A74
|
||||
A71B225203CE5F0900A967F8 = {
|
||||
isa = PBXFileReference;
|
||||
name = libgfxshared_s.a;
|
||||
path = ../gfx/src/shared/libgfxshared_s.a;
|
||||
refType = 2;
|
||||
};
|
||||
A71B225303CE5F0900A967F8 = {
|
||||
fileRef = A71B225203CE5F0900A967F8;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
A74F8BD203CE582D00A967F8 = {
|
||||
isa = PBXFileReference;
|
||||
name = libi18n.a;
|
||||
|
|
@ -915,6 +927,18 @@
|
|||
settings = {
|
||||
};
|
||||
};
|
||||
A75174AD03CE5D7600A967F8 = {
|
||||
isa = PBXFileReference;
|
||||
name = libimglib2.a;
|
||||
path = ../modules/libpr0n/build/libimglib2.a;
|
||||
refType = 2;
|
||||
};
|
||||
A75174AE03CE5D7D00A967F8 = {
|
||||
fileRef = A75174AD03CE5D7600A967F8;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
A7AEBEB103CB950400A967F8 = {
|
||||
isa = PBXFileReference;
|
||||
name = xmlextras.xpt;
|
||||
|
|
@ -5000,6 +5024,8 @@
|
|||
F54AD84402C115D901A967F3,
|
||||
F5E47654030C5FD501A967F3,
|
||||
A74F8BD203CE582D00A967F8,
|
||||
A75174AD03CE5D7600A967F8,
|
||||
A71B225203CE5F0900A967F8,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Static Components";
|
||||
|
|
@ -7152,7 +7178,6 @@
|
|||
);
|
||||
buildSettings = {
|
||||
DEBUGGING_SYMBOLS = NO;
|
||||
FRAMEWORK_SEARCH_PATHS = /Users/sdagley/Library/Frameworks;
|
||||
HEADER_SEARCH_PATHS = "../dist/include/helperAppDlg ../dist/include/exthandler ../dist/include/intl ../dist/include/pipboot ../dist/include/pipnss ../dist/include/webbrwsr ../dist/include/dom ../dist/include/nspr ../dist/include/string ../dist/include/rdf ../dist/include/necko ../dist/include/find ../dist/include/embed_base ../dist/include/commandhandler ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/nkcache ../dist/include/docshell ../dist/include/profile ../dist/include/layout ../dist/include/content ../dist/include/webbrowserpersist ../dist/include/pref ../dist/include/mimetype ../dist/include/shistory ../dist/include/view ../dist/include/gfx ../dist/include/xultmpl ../dist/include/xmlextras ../dist/include/htmlparser ../dist/include/locale ../dist/include/unicharutil ../dist/include/appcomps ../dist/include/chrome ../dist/include/xpcom ../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/SharedMenusCocoa.framework/Headers\"";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../dist/lib/components ../intl/unicharutil/src ../gfx/src ../js/src/liveconnect ../intl/unicharutil/util";
|
||||
|
|
@ -7649,6 +7674,7 @@
|
|||
F5AC38BA02AD8E7B01A967F3,
|
||||
F54AD84502C115DA01A967F3,
|
||||
F5E47655030C5FD501A967F3,
|
||||
A75174AE03CE5D7D00A967F8,
|
||||
F5BAAB9B02AC4AA701A967F3,
|
||||
F5BAAB9E02AC4AA701A967F3,
|
||||
F5BAABA002AC4AA701A967F3,
|
||||
|
|
@ -7656,6 +7682,7 @@
|
|||
F5BAABA102AC4AA701A967F3,
|
||||
F5BAABA202AC4AA701A967F3,
|
||||
F55A4DF50380705A01A80166,
|
||||
A71B225303CE5F0900A967F8,
|
||||
);
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
|
|||
|
|
@ -47,20 +47,9 @@ NSGETMODULE(_name) (nsIComponentManager* aCompMgr, \
|
|||
}
|
||||
|
||||
// NSGetModule entry points
|
||||
DECL_NSGETMODULE(UcharUtil)
|
||||
DECL_NSGETMODULE(nsUConvModule)
|
||||
DECL_NSGETMODULE(nsUCvJAModule)
|
||||
DECL_NSGETMODULE(nsUCvCnModule)
|
||||
DECL_NSGETMODULE(nsUCvLatinModule)
|
||||
DECL_NSGETMODULE(nsUCvTWModule)
|
||||
DECL_NSGETMODULE(nsUCvTW2Module)
|
||||
DECL_NSGETMODULE(nsUCvKoModule)
|
||||
DECL_NSGETMODULE(nsLocaleModule)
|
||||
DECL_NSGETMODULE(nsStringBundleModule)
|
||||
DECL_NSGETMODULE(nsLWBrkModule)
|
||||
DECL_NSGETMODULE(nsCharDetModule)
|
||||
DECL_NSGETMODULE(nsI18nModule)
|
||||
DECL_NSGETMODULE(xpconnect)
|
||||
DECL_NSGETMODULE(cacheservice)
|
||||
DECL_NSGETMODULE(necko_core_and_primary_protocols)
|
||||
DECL_NSGETMODULE(necko_secondary_protocols)
|
||||
DECL_NSGETMODULE(nsURILoaderModule)
|
||||
|
|
@ -71,14 +60,9 @@ DECL_NSGETMODULE(nsChromeModule)
|
|||
DECL_NSGETMODULE(nsRDFModule)
|
||||
DECL_NSGETMODULE(nsParserModule)
|
||||
DECL_NSGETMODULE(nsGfxMacModule)
|
||||
DECL_NSGETMODULE(nsGfx2Module)
|
||||
DECL_NSGETMODULE(nsImageLib2Module)
|
||||
DECL_NSGETMODULE(nsPNGDecoderModule)
|
||||
DECL_NSGETMODULE(nsGIFModule2)
|
||||
DECL_NSGETMODULE(nsJPEGDecoderModule)
|
||||
DECL_NSGETMODULE(nsPluginModule)
|
||||
DECL_NSGETMODULE(javascript__protocol)
|
||||
DECL_NSGETMODULE(JS_component_loader)
|
||||
DECL_NSGETMODULE(DOM_components)
|
||||
DECL_NSGETMODULE(nsViewModule)
|
||||
DECL_NSGETMODULE(nsWidgetMacModule)
|
||||
|
|
@ -90,7 +74,6 @@ DECL_NSGETMODULE(embedcomponents)
|
|||
DECL_NSGETMODULE(Browser_Embedding_Module)
|
||||
DECL_NSGETMODULE(nsEditorModule)
|
||||
DECL_NSGETMODULE(nsTransactionManagerModule)
|
||||
DECL_NSGETMODULE(nsTextServicesModule)
|
||||
DECL_NSGETMODULE(nsProfileModule)
|
||||
DECL_NSGETMODULE(Session_History_Module)
|
||||
DECL_NSGETMODULE(application)
|
||||
|
|
@ -106,20 +89,9 @@ DECL_NSGETMODULE(NSS)
|
|||
*/
|
||||
static nsStaticModuleInfo gStaticModuleInfo[] = {
|
||||
#define MODULE(_name) { (#_name), NSGETMODULE(_name) }
|
||||
MODULE(UcharUtil),
|
||||
MODULE(nsUConvModule),
|
||||
MODULE(nsUCvJAModule),
|
||||
MODULE(nsUCvCnModule),
|
||||
MODULE(nsUCvLatinModule),
|
||||
MODULE(nsUCvTWModule),
|
||||
MODULE(nsUCvTW2Module),
|
||||
MODULE(nsUCvKoModule),
|
||||
MODULE(nsLocaleModule),
|
||||
MODULE(nsStringBundleModule),
|
||||
MODULE(nsLWBrkModule),
|
||||
MODULE(nsCharDetModule),
|
||||
MODULE(nsI18nModule),
|
||||
MODULE(xpconnect),
|
||||
MODULE(cacheservice),
|
||||
MODULE(necko_core_and_primary_protocols),
|
||||
MODULE(necko_secondary_protocols),
|
||||
MODULE(nsURILoaderModule),
|
||||
|
|
@ -130,14 +102,9 @@ MODULE(nsChromeModule),
|
|||
MODULE(nsRDFModule),
|
||||
MODULE(nsParserModule),
|
||||
MODULE(nsGfxMacModule),
|
||||
MODULE(nsGfx2Module),
|
||||
MODULE(nsImageLib2Module),
|
||||
MODULE(nsPNGDecoderModule),
|
||||
MODULE(nsGIFModule2),
|
||||
MODULE(nsJPEGDecoderModule),
|
||||
MODULE(nsPluginModule),
|
||||
MODULE(javascript__protocol),
|
||||
MODULE(JS_component_loader),
|
||||
MODULE(DOM_components),
|
||||
MODULE(nsViewModule),
|
||||
MODULE(nsWidgetMacModule),
|
||||
|
|
@ -149,7 +116,6 @@ MODULE(embedcomponents),
|
|||
MODULE(Browser_Embedding_Module),
|
||||
MODULE(nsEditorModule),
|
||||
MODULE(nsTransactionManagerModule),
|
||||
MODULE(nsTextServicesModule),
|
||||
MODULE(nsProfileModule),
|
||||
MODULE(Session_History_Module),
|
||||
MODULE(application),
|
||||
|
|
|
|||
|
|
@ -903,6 +903,18 @@
|
|||
//A72
|
||||
//A73
|
||||
//A74
|
||||
A71B225203CE5F0900A967F8 = {
|
||||
isa = PBXFileReference;
|
||||
name = libgfxshared_s.a;
|
||||
path = ../gfx/src/shared/libgfxshared_s.a;
|
||||
refType = 2;
|
||||
};
|
||||
A71B225303CE5F0900A967F8 = {
|
||||
fileRef = A71B225203CE5F0900A967F8;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
A74F8BD203CE582D00A967F8 = {
|
||||
isa = PBXFileReference;
|
||||
name = libi18n.a;
|
||||
|
|
@ -915,6 +927,18 @@
|
|||
settings = {
|
||||
};
|
||||
};
|
||||
A75174AD03CE5D7600A967F8 = {
|
||||
isa = PBXFileReference;
|
||||
name = libimglib2.a;
|
||||
path = ../modules/libpr0n/build/libimglib2.a;
|
||||
refType = 2;
|
||||
};
|
||||
A75174AE03CE5D7D00A967F8 = {
|
||||
fileRef = A75174AD03CE5D7600A967F8;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
A7AEBEB103CB950400A967F8 = {
|
||||
isa = PBXFileReference;
|
||||
name = xmlextras.xpt;
|
||||
|
|
@ -5000,6 +5024,8 @@
|
|||
F54AD84402C115D901A967F3,
|
||||
F5E47654030C5FD501A967F3,
|
||||
A74F8BD203CE582D00A967F8,
|
||||
A75174AD03CE5D7600A967F8,
|
||||
A71B225203CE5F0900A967F8,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Static Components";
|
||||
|
|
@ -7152,7 +7178,6 @@
|
|||
);
|
||||
buildSettings = {
|
||||
DEBUGGING_SYMBOLS = NO;
|
||||
FRAMEWORK_SEARCH_PATHS = /Users/sdagley/Library/Frameworks;
|
||||
HEADER_SEARCH_PATHS = "../dist/include/helperAppDlg ../dist/include/exthandler ../dist/include/intl ../dist/include/pipboot ../dist/include/pipnss ../dist/include/webbrwsr ../dist/include/dom ../dist/include/nspr ../dist/include/string ../dist/include/rdf ../dist/include/necko ../dist/include/find ../dist/include/embed_base ../dist/include/commandhandler ../dist/include/windowwatcher ../dist/include/webshell ../dist/include/widget ../dist/include/uriloader ../dist/include/nkcache ../dist/include/docshell ../dist/include/profile ../dist/include/layout ../dist/include/content ../dist/include/webbrowserpersist ../dist/include/pref ../dist/include/mimetype ../dist/include/shistory ../dist/include/view ../dist/include/gfx ../dist/include/xultmpl ../dist/include/xmlextras ../dist/include/htmlparser ../dist/include/locale ../dist/include/unicharutil ../dist/include/appcomps ../dist/include/chrome ../dist/include/xpcom ../dist/include/ \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/SharedMenusCocoa.framework/Headers\"";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = "../dist/bin ../dist/lib ../dist/lib/components ../intl/unicharutil/src ../gfx/src ../js/src/liveconnect ../intl/unicharutil/util";
|
||||
|
|
@ -7649,6 +7674,7 @@
|
|||
F5AC38BA02AD8E7B01A967F3,
|
||||
F54AD84502C115DA01A967F3,
|
||||
F5E47655030C5FD501A967F3,
|
||||
A75174AE03CE5D7D00A967F8,
|
||||
F5BAAB9B02AC4AA701A967F3,
|
||||
F5BAAB9E02AC4AA701A967F3,
|
||||
F5BAABA002AC4AA701A967F3,
|
||||
|
|
@ -7656,6 +7682,7 @@
|
|||
F5BAABA102AC4AA701A967F3,
|
||||
F5BAABA202AC4AA701A967F3,
|
||||
F55A4DF50380705A01A80166,
|
||||
A71B225303CE5F0900A967F8,
|
||||
);
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
|
|||
|
|
@ -47,20 +47,9 @@ NSGETMODULE(_name) (nsIComponentManager* aCompMgr, \
|
|||
}
|
||||
|
||||
// NSGetModule entry points
|
||||
DECL_NSGETMODULE(UcharUtil)
|
||||
DECL_NSGETMODULE(nsUConvModule)
|
||||
DECL_NSGETMODULE(nsUCvJAModule)
|
||||
DECL_NSGETMODULE(nsUCvCnModule)
|
||||
DECL_NSGETMODULE(nsUCvLatinModule)
|
||||
DECL_NSGETMODULE(nsUCvTWModule)
|
||||
DECL_NSGETMODULE(nsUCvTW2Module)
|
||||
DECL_NSGETMODULE(nsUCvKoModule)
|
||||
DECL_NSGETMODULE(nsLocaleModule)
|
||||
DECL_NSGETMODULE(nsStringBundleModule)
|
||||
DECL_NSGETMODULE(nsLWBrkModule)
|
||||
DECL_NSGETMODULE(nsCharDetModule)
|
||||
DECL_NSGETMODULE(nsI18nModule)
|
||||
DECL_NSGETMODULE(xpconnect)
|
||||
DECL_NSGETMODULE(cacheservice)
|
||||
DECL_NSGETMODULE(necko_core_and_primary_protocols)
|
||||
DECL_NSGETMODULE(necko_secondary_protocols)
|
||||
DECL_NSGETMODULE(nsURILoaderModule)
|
||||
|
|
@ -71,14 +60,9 @@ DECL_NSGETMODULE(nsChromeModule)
|
|||
DECL_NSGETMODULE(nsRDFModule)
|
||||
DECL_NSGETMODULE(nsParserModule)
|
||||
DECL_NSGETMODULE(nsGfxMacModule)
|
||||
DECL_NSGETMODULE(nsGfx2Module)
|
||||
DECL_NSGETMODULE(nsImageLib2Module)
|
||||
DECL_NSGETMODULE(nsPNGDecoderModule)
|
||||
DECL_NSGETMODULE(nsGIFModule2)
|
||||
DECL_NSGETMODULE(nsJPEGDecoderModule)
|
||||
DECL_NSGETMODULE(nsPluginModule)
|
||||
DECL_NSGETMODULE(javascript__protocol)
|
||||
DECL_NSGETMODULE(JS_component_loader)
|
||||
DECL_NSGETMODULE(DOM_components)
|
||||
DECL_NSGETMODULE(nsViewModule)
|
||||
DECL_NSGETMODULE(nsWidgetMacModule)
|
||||
|
|
@ -90,7 +74,6 @@ DECL_NSGETMODULE(embedcomponents)
|
|||
DECL_NSGETMODULE(Browser_Embedding_Module)
|
||||
DECL_NSGETMODULE(nsEditorModule)
|
||||
DECL_NSGETMODULE(nsTransactionManagerModule)
|
||||
DECL_NSGETMODULE(nsTextServicesModule)
|
||||
DECL_NSGETMODULE(nsProfileModule)
|
||||
DECL_NSGETMODULE(Session_History_Module)
|
||||
DECL_NSGETMODULE(application)
|
||||
|
|
@ -106,20 +89,9 @@ DECL_NSGETMODULE(NSS)
|
|||
*/
|
||||
static nsStaticModuleInfo gStaticModuleInfo[] = {
|
||||
#define MODULE(_name) { (#_name), NSGETMODULE(_name) }
|
||||
MODULE(UcharUtil),
|
||||
MODULE(nsUConvModule),
|
||||
MODULE(nsUCvJAModule),
|
||||
MODULE(nsUCvCnModule),
|
||||
MODULE(nsUCvLatinModule),
|
||||
MODULE(nsUCvTWModule),
|
||||
MODULE(nsUCvTW2Module),
|
||||
MODULE(nsUCvKoModule),
|
||||
MODULE(nsLocaleModule),
|
||||
MODULE(nsStringBundleModule),
|
||||
MODULE(nsLWBrkModule),
|
||||
MODULE(nsCharDetModule),
|
||||
MODULE(nsI18nModule),
|
||||
MODULE(xpconnect),
|
||||
MODULE(cacheservice),
|
||||
MODULE(necko_core_and_primary_protocols),
|
||||
MODULE(necko_secondary_protocols),
|
||||
MODULE(nsURILoaderModule),
|
||||
|
|
@ -130,14 +102,9 @@ MODULE(nsChromeModule),
|
|||
MODULE(nsRDFModule),
|
||||
MODULE(nsParserModule),
|
||||
MODULE(nsGfxMacModule),
|
||||
MODULE(nsGfx2Module),
|
||||
MODULE(nsImageLib2Module),
|
||||
MODULE(nsPNGDecoderModule),
|
||||
MODULE(nsGIFModule2),
|
||||
MODULE(nsJPEGDecoderModule),
|
||||
MODULE(nsPluginModule),
|
||||
MODULE(javascript__protocol),
|
||||
MODULE(JS_component_loader),
|
||||
MODULE(DOM_components),
|
||||
MODULE(nsViewModule),
|
||||
MODULE(nsWidgetMacModule),
|
||||
|
|
@ -149,7 +116,6 @@ MODULE(embedcomponents),
|
|||
MODULE(Browser_Embedding_Module),
|
||||
MODULE(nsEditorModule),
|
||||
MODULE(nsTransactionManagerModule),
|
||||
MODULE(nsTextServicesModule),
|
||||
MODULE(nsProfileModule),
|
||||
MODULE(Session_History_Module),
|
||||
MODULE(application),
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче