From 644516c52a45d225ef3f3aef8f804dd0764c65a5 Mon Sep 17 00:00:00 2001 From: sfraser Date: Thu, 28 May 1998 19:16:03 +0000 Subject: [PATCH] Updating for new build system and prefix files. git-svn-id: svn://10.0.0.236/trunk@2534 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/macbuild/xpcom.Prefix | 25 ++++++++++++++++++--- mozilla/xpcom/macbuild/xpcomConfig.h | 27 +++++++++++++++-------- mozilla/xpcom/macbuild/xpcomDebug.Prefix | 27 ++++++++++++++++++----- mozilla/xpcom/macbuild/xpcomPPC.mcp | Bin 33383 -> 55405 bytes 4 files changed, 62 insertions(+), 17 deletions(-) diff --git a/mozilla/xpcom/macbuild/xpcom.Prefix b/mozilla/xpcom/macbuild/xpcom.Prefix index 507f65b847c..af1f7757b2a 100644 --- a/mozilla/xpcom/macbuild/xpcom.Prefix +++ b/mozilla/xpcom/macbuild/xpcom.Prefix @@ -1,8 +1,27 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + // -// JavaScript.Prefix +// xpcom.Prefix // -// Global prefix file for the JavaScriptPPC project. +// Global prefix file for the xpcom project. // // -#include "xpcomConfig.h" \ No newline at end of file +#include "MacPrefix.h" +#include "xpcomConfig.h" diff --git a/mozilla/xpcom/macbuild/xpcomConfig.h b/mozilla/xpcom/macbuild/xpcomConfig.h index 18071a403e3..769a7a9706b 100644 --- a/mozilla/xpcom/macbuild/xpcomConfig.h +++ b/mozilla/xpcom/macbuild/xpcomConfig.h @@ -1,10 +1,19 @@ -#error "Don't use me" +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ -#define EDITOR 1 - -#include "NSCrossProductDefines.h" -#include "IDE_Options.h" - -//#define JAVA - -#define MOZILLA_CLIENT 1 +/* Nothing to do here. Add xpcom-specific defines here if necessary */ diff --git a/mozilla/xpcom/macbuild/xpcomDebug.Prefix b/mozilla/xpcom/macbuild/xpcomDebug.Prefix index 48ec0a1c4a0..dab4c95f253 100644 --- a/mozilla/xpcom/macbuild/xpcomDebug.Prefix +++ b/mozilla/xpcom/macbuild/xpcomDebug.Prefix @@ -1,10 +1,27 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + // -// JavaScriptDebug.Prefix +// xpcomDebug.Prefix // -// Global prefix file for the JavaScriptPPCDebug project. +// Global prefix file for the xpcomDebug project. // // -#define DEBUG 1 -#define DEVELOPER_DEBUG 1 -#include "xpcomConfig.h" \ No newline at end of file +#include "MacPrefix_debug.h" +#include "xpcomConfig.h" diff --git a/mozilla/xpcom/macbuild/xpcomPPC.mcp b/mozilla/xpcom/macbuild/xpcomPPC.mcp index d5445b5c4076459fa792539d3fcbec22e538fbac..cad52c5c73e4adfef48270cd447fb7c3d153a424 100644 GIT binary patch delta 6355 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 F{{tkK{5=2w delta 2161 zcmb7FTWnNS6y4{}%$;`TPN$_WXp6mdTH2v4LcuZ&fwZL$iqkr!Y6wQsPN{X0PCHDe z*y5uYO(bfFgNc6|xALJ$yf&r_9;48H12UZgJQh$74oBMR8{~}RD>>+_9rL1R3Mil%%~qfdX|56F!L<8mChorrLEFZTs!1;o(8f>c(R;!)43D)M^NS}S8 zxr}w8`?e;}cSo)E(rYg3qn4m1`#eUux^XTZzWKZ}ueKk!d-wcf)_hC3R>Nyu52eldPXx9n2ZPWZ5?Y67Q(?(Qf-Fm~X6`@i{gu~(3bbNe&I59k8Exz|P%G@+L zgQ`!=shlRJlBwi$EKITR{;8~Em679^Z;3Yztq$q+Y{+;###zIC!y|p8iOJM#`}p|e z$Z&cxWyi}lU$M!vAjJQ#kp98l(-Y}XgF^`=GN2q- z3GjDcA*|_$-)TL6u)4zf{OFhHj(a`U&CfhIo{$yUz9g)%{uKg`#YQn#x|3h9#8f(U zZ@IR?kEMfoemrx;30^Qikwe0Cn_QzRkK>2G$9%}YoF|uesXWDYqTGSPopOGmOja+t zT;Gx+hVNTx=gBysou zwFjz1P4Mmp*!&zp^k1Poir>MD;l~Nmc^&GKn)n>&XZujI1Kv%W-&3B!a5bO_hs1YnI$^-9KZaEKY9)XFA8$#IQUM*?|U3Xi%pYp4DCwh zg>f9GMH>O0zqbR*-hnXgyajs`0O{pRE>Hn`#$Z3lEcm@pmu=ox-3hyuS)!SF>}*N# zo-aUbwrN_8T2v=0j3NF9=f6Hk&px6Kim3_yxB_O2%~M228&Zjkqp