Menu
▾
▴
SF.net SVN: frontierkernel: [1396] Frontier/branches/Int64/Common/source
|
From: <kar...@us...> - 2006-06-02 15:59:48
|
Revision: 1396 Author: karstenw Date: 2006-06-02 08:59:34 -0700 (Fri, 02 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1396&view=rev Log Message: ----------- Some cleanup, some comments and finally expressions evaluate correctly. This is cool. Modified Paths: -------------- Frontier/branches/Int64/Common/headers/file.h Frontier/branches/Int64/Common/headers/lang.h Frontier/branches/Int64/Common/source/fileops.c Frontier/branches/Int64/Common/source/langops.c Frontier/branches/Int64/Common/source/langscan.c Frontier/branches/Int64/Common/source/langvalue.c Frontier/branches/Int64/Common/source/oplist.c Frontier/branches/Int64/Common/source/strings.c Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj Modified: Frontier/branches/Int64/Common/headers/file.h =================================================================== --- Frontier/branches/Int64/Common/headers/file.h 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/headers/file.h 2006-06-02 15:59:34 UTC (rev 1396) @@ -244,6 +244,12 @@ extern boolean getmacfileinfo (const tyfilespec *fs, CInfoPBRec *pb); +#if LONGINT_LONGDATE == 1 // getosxfileinfo() + +extern boolean getosxfileinfo (const tyfilespec *fs, FSRefParam *pb); + +#endif + extern boolean filemakespec (short vnum, long dirid, bigstring fname, ptrfilespec pfs); extern boolean filegetfilename (const tyfilespec *pfs, bigstring name); // 1/28/97 dmb end for clay Modified: Frontier/branches/Int64/Common/headers/lang.h =================================================================== --- Frontier/branches/Int64/Common/headers/lang.h 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/headers/lang.h 2006-06-02 15:59:34 UTC (rev 1396) @@ -262,30 +262,40 @@ the value would actually be externalvaluetype; these are for flattening external types into a typevaluetype */ - + + /* 31 */ outlinevaluetype, + /* 32 */ wordvaluetype, + /* 33 */ headvaluetype, + /* 34 */ tablevaluetype, + /* 35 */ scriptvaluetype, + /* 36 */ menuvaluetype, + /* 37 */ pictvaluetype, #ifdef xmlfeatures + /* not used */ xmlvaluetype, #endif /*new types must be added at end of list, these get saved on disk*/ #if LONGINT_LONGDATE == 1 // tyvaluetype enum // kw - 2006-01-27 --- new types added + /* 38 */ longlongintvaluetype, + /* 39 */ longdatetimevaluetype, #endif ctvaluetypes @@ -462,11 +472,11 @@ hdlhashnode thistableshashnode; /*this tables hashnode referenced in it's parents hashbuckets 12/29/99 RAB*/ - #ifdef fltracklocaladdresses +#ifdef fltracklocaladdresses hdlhashnode refnodes; /*linked list of hash nodes containing addresses that reference an object in this table*/ - #endif +#endif boolean fldirty: 1; /*indicates whether anything has changed*/ @@ -490,9 +500,9 @@ boolean flmayaffectdisplay: 1; /*has this table ever been displayed in any table window?*/ - #ifdef xmlfeatures - boolean flxml: 1; - #endif +#ifdef xmlfeatures + boolean flxml: 1; +#endif boolean flsubsdirty: 1; /*has this table got dirty subs -- set in tablepreflightsubsdirtyflag before saving*/ @@ -500,11 +510,11 @@ long lexicalrefcon; - #if odbengine || !flruntime +#if odbengine || !flruntime struct tytableformats **hashtableformats; /*place to link in a display formats record*/ - #endif +#endif short sortorder; /*up to the application to understand what this means*/ @@ -549,13 +559,13 @@ unsigned short errorchar; - #ifdef flnewfeatures +#ifdef flnewfeatures unsigned long profilebase; unsigned long profiletotal; - #endif +#endif long errorrefcon; } tyerrorrecord; @@ -660,19 +670,19 @@ langeventcallback processeventcallback; - #ifdef flnewfeatures +#ifdef flnewfeatures langerrormessagecallback debugerrormessagecallback; - #endif +#endif - #ifdef flcomponent +#ifdef flcomponent callback presystemdialogcallback; callback postsystemdialogcallback; - #endif +#endif } tylangcallbacks; @@ -917,7 +927,8 @@ extern boolean hashtablesymbolexists (hdlhashtable, const bigstring); -extern void hashsetlocality (tyvaluerecord *, boolean); /*6.2b16 AR: needed to set locality in langaddlocals [langevaluate.c]*/ +/*6.2b16 AR: needed to set locality in langaddlocals [langevaluate.c]*/ +extern void hashsetlocality (tyvaluerecord *, boolean); extern boolean hashassign (const bigstring, tyvaluerecord); @@ -1070,6 +1081,7 @@ extern boolean getlonglongintparam(hdltreenode hfirst, short pnum, tyvaluerecord *v); extern boolean getlonglongintvalue (hdltreenode hfirst, short pnum, tylonglongint *lval); + #endif extern boolean setdatevalue (unsigned long, tyvaluerecord *); @@ -1191,15 +1203,18 @@ extern boolean getparamvalue (hdltreenode, short, tyvaluerecord *); -extern boolean getreadonlyparamvalue (hdltreenode, short, tyvaluerecord *); /* 2003-04-28 AR: needed in langregexp.c */ +/* 2003-04-28 AR: needed in langregexp.c */ +extern boolean getreadonlyparamvalue (hdltreenode, short, tyvaluerecord *); extern boolean getoptionalparam (hdltreenode, short *, short *, bigstring, hdltreenode *); extern boolean getoptionalparamvalue (hdltreenode, short *, short *, bigstring, tyvaluerecord *); -extern boolean getoptionaladdressparam (hdltreenode , short *, short *, bigstring , hdlhashtable *, bigstring); /*2006-03-10 aradke*/ +/*2006-03-10 aradke*/ +extern boolean getoptionaladdressparam (hdltreenode , short *, short *, bigstring , hdlhashtable *, bigstring); -extern boolean getoptionaltableparam (hdltreenode , short *, short *, bigstring, hdlhashtable *); /*2006-03-10 aradke*/ +/*2006-03-10 aradke*/ +extern boolean getoptionaltableparam (hdltreenode , short *, short *, bigstring, hdlhashtable *); extern boolean getaddressparam (hdltreenode, short, tyvaluerecord *); @@ -1351,6 +1366,3 @@ extern boolean langsettarget (hdlhashtable htable, bigstring bsname, tyvaluerecord *prevtarget); #endif - - - Modified: Frontier/branches/Int64/Common/source/fileops.c =================================================================== --- Frontier/branches/Int64/Common/source/fileops.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/fileops.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -261,7 +261,7 @@ #if LONGINT_LONGDATE == 1 // getosxfileinfo() -boolean getosxfileinfo (const tyfilespec *fs, CInfoPBRec *pb) { +boolean getosxfileinfo (const tyfilespec *fs, FSRefParam *pb) { /* 2.1b2 dmb: new fsspec-based version @@ -271,14 +271,16 @@ clearbytes (pb, sizeof (*pb)); - (*pb).hFileInfo.ioNamePtr = (StringPtr) (*fs).name; +// (*pb).hFileInfo.ioNamePtr = (StringPtr) (*fs).name; - (*pb).hFileInfo.ioVRefNum = (*fs).vRefNum; +// (*pb).hFileInfo.ioVRefNum = (*fs).vRefNum; - (*pb).hFileInfo.ioDirID = (*fs).parID; - - return (!oserror (PBGetCatInfoSync (pb))); -} /*getmacfileinfo*/ +// (*pb).hFileInfo.ioDirID = (*fs).parID; + + //extern OSErr PBGetCatalogInfoSync(FSRefParam * paramBlock) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER; + + return (false); //(!oserror (PBGetCatInfoSync (pb))); +} /* getosxfileinfo */ #endif Modified: Frontier/branches/Int64/Common/source/langops.c =================================================================== --- Frontier/branches/Int64/Common/source/langops.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/langops.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -171,10 +171,13 @@ boolean fl = true; +#if LONGINT_LONGDATE == 1 // delete me after debugging // kw - 2006-01 --- debugging stuff int x = type, y = ctvaluetypes; +#endif + tytypeinfo z = typeinfo[type]; if ((type < novaluetype) || (type >= ctvaluetypes)) { @@ -184,10 +187,12 @@ fl = false; } +#if LONGINT_LONGDATE == 1 // delete me after debugging if (x >= 38) x = x * 1; // just for getting a debugging break when needed else x = x * 1; +#endif copystring ((ptrstring) typeinfo [type].bsname, bs); Modified: Frontier/branches/Int64/Common/source/langscan.c =================================================================== --- Frontier/branches/Int64/Common/source/langscan.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/langscan.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -473,11 +473,14 @@ // "0x" + 16 hex chars if (stringlength (bsnumber) > 18) goto overflow; + + hexstringtolonglongint (bsnumber, &x); #else if (stringlength (bsnumber) > 10) goto overflow; + + hexstringtonumber (bsnumber, &x); #endif - hexstringtonumber (bsnumber, &x); } else { #if LONGINT_LONGDATE == 1 // in parsepopnumber() Modified: Frontier/branches/Int64/Common/source/langvalue.c =================================================================== --- Frontier/branches/Int64/Common/source/langvalue.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/langvalue.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -5535,7 +5535,7 @@ return (true); } /*getlongvalue*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // getlonglongintvalue() boolean getlonglongintvalue ( hdltreenode hfirst, @@ -6732,18 +6732,43 @@ (*vreturned).data.chvalue = v1.data.chvalue + v2.data.chvalue; break; - + case intvaluetype: (*vreturned).data.intvalue = v1.data.intvalue + v2.data.intvalue; break; + +#if LONGINT_LONGDATE == 1 // in addvalue() + case longvaluetype: + case ostypevaluetype: + { + tylonglongint t1; + + t1 = (tylonglongint)v1.data.longvalue + (tylonglongint)v2.data.longvalue; + + if ( (t1 > LONG_MAX ) + || (t1 < LONG_MIN)) + { + coercetolonglong(vreturned); + + fl = setlonglongintvalue (t1, vreturned); + + } + else + { + (*vreturned).data.longvalue = (long)t1; + } + + break; + } +#else case longvaluetype: case ostypevaluetype: (*vreturned).data.longvalue = v1.data.longvalue + v2.data.longvalue; break; - +#endif case directionvaluetype: (*vreturned).data.dirvalue = (tydirection) ((short) v1.data.dirvalue + (short) v2.data.dirvalue); @@ -6899,13 +6924,39 @@ (*vreturned).data.intvalue = v1.data.intvalue - v2.data.intvalue; break; - + +#if LONGINT_LONGDATE == 1 // in subtractvalue() case longvaluetype: case ostypevaluetype: + { + tylonglongint t1; + + t1 = (tylonglongint)v1.data.longvalue - (tylonglongint)v2.data.longvalue; + + if ( (t1 > LONG_MAX ) + || (t1 < LONG_MIN)) + { + coercetolonglong(vreturned); + + fl = setlonglongintvalue (t1, vreturned); + + } + else + { + (*vreturned).data.longvalue = (long)t1; + } + + break; + } +#else + case longvaluetype: + case ostypevaluetype: (*vreturned).data.longvalue = v1.data.longvalue - v2.data.longvalue; break; - + +#endif + case directionvaluetype: (*vreturned).data.dirvalue = (tydirection) ((short) v1.data.dirvalue - (short) v2.data.dirvalue); @@ -7030,12 +7081,36 @@ (*vreturned).data.intvalue = v1.data.intvalue * v2.data.intvalue; break; - +#if LONGINT_LONGDATE == 1 // in multiplyvalue() case longvaluetype: + { + tylonglongint t1; + + t1 = (tylonglongint)v1.data.longvalue * (tylonglongint)v2.data.longvalue; + + if ( (t1 > LONG_MAX ) + || (t1 < LONG_MIN)) + { + coercetolonglong(vreturned); + + fl = setlonglongintvalue (t1, vreturned); + + } + else + { + (*vreturned).data.longvalue = (long)t1; + } + + break; + } +#else + + case longvaluetype: (*vreturned).data.longvalue = v1.data.longvalue * v2.data.longvalue; break; - +#endif + case directionvaluetype: (*vreturned).data.dirvalue = (tydirection) ((short) v1.data.dirvalue * (short) v2.data.dirvalue); Modified: Frontier/branches/Int64/Common/source/oplist.c =================================================================== --- Frontier/branches/Int64/Common/source/oplist.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/oplist.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -62,12 +62,13 @@ #if OPLANGLISTACCEL == 1 // struct tylistindex typedef struct tylistindex { - hdlheadrecord oplistindex; SInt32 first, current, ctelements, size; +// hdlheadrecord oplistindex[]; + Handle oplistindex; } tylistindex, *tylistindexptr, **tylistindexhdl; #endif @@ -175,7 +176,9 @@ // one quarter reserved for unshift ops plistidx->first = plistidx->current = nsize >> 2; + plistidx->ctelements = 0; + plistidx->size = nsize; return(true); @@ -184,6 +187,8 @@ static SInt32 rel2absIndex(tylistindexptr theIndex, SInt32 n) { + // convert a relative index (list[i]) into an absolute index + // into the cache array return( n + theIndex->first - 1); } @@ -191,6 +196,14 @@ static relativeindextype checkValidityOfRelativeIndex(tylistindexptr theIndex, SInt32 n) { + // analyze n + // returns + // addshift the index is an unshift op + // firstadd the index is the first added to the cache + // addpush the index is a push op + // existing the index is a retrieve/replace/delete op + // outofbounds the index should never be requested + // n is either in or +-1 near the bounds of the list SInt32 shiftsize, pushsize, usedsize, nextidx, absn; @@ -215,6 +228,9 @@ static boolean checklistindexlimits(tylistindexptr theIndex) { + // return true if cache can accept unshift/push ops; grow cache if necessary + // return false if growcache failed + /* check the remaining space in the cache grow it if only to free places on either side @@ -275,11 +291,19 @@ } lockhandle(theIndex->oplistindex); + + // a move of the existing cache entries should be here + + // calc moveright amount & size + + // moveright + + theIndex->size = thesize; calcIndexVars(theIndex, &shiftsize, &pushsize, &usedsize, &nextidx); - // BULLSHIT! + // cattle excrement! // ToDo: shift first off to make room for unshift /* s = *(theIndex->oplistindex) + (theIndex->first * sizeof(void *)); @@ -294,6 +318,13 @@ static boolean getindexedadr(tylistindexptr theIndex, long n, hdlheadrecord *h) { + // try to retrieve the handle for list entry n + + // return false on failure + + // return true and handle in h + + hdlheadrecord *dst; SInt32 relIndex = n + theIndex->first - 1; SInt32 shiftsize, pushsize, usedsize, nextidx; @@ -326,9 +357,12 @@ return (true); } + static hdlheadrecord getlastindexedadr(tylistindexptr theIndex, long n, hdlheadrecord *h) { + /* this should acompany repeatedbump_down to get the last list item*/ + SInt32 s = theIndex->first, r = n + s - 1, @@ -354,6 +388,8 @@ static boolean setindexedadr(tylistindexptr theIndex, long n, hdlheadrecord *h) { + /* cache the handle h for list entry n */ + hdlheadrecord *dst; SInt32 s = theIndex->first, @@ -472,9 +508,11 @@ h = *hlist; /*copy into register*/ #if OPLANGLISTACCEL == 1 // in opnewlist() + (**h).listindex.oplistindex = nil; if (!initlistindex(&((**h).listindex))) return(false); + #endif if (!newoutlinerecord (&houtline)) { @@ -505,7 +543,7 @@ void opdisposelist (hdllistrecord hlist) { - register hdloutlinerecord ho; + hdloutlinerecord ho; if (hlist == nil) /*defensive driving*/ return; @@ -519,8 +557,10 @@ hcurrentlist = nil; #if OPLANGLISTACCEL == 1 // in opdisposelist() + if (!disposelistindex(&((**hlist).listindex))) ; + #endif disposehandle ((Handle) hlist); } /*opdisposelist*/ @@ -567,10 +607,12 @@ opsetheadstring (hnew, bs); #if OPLANGLISTACCEL == 1 // in oppushhandle() + // set value at index 1 if (!(**h).isrecord) if (!setindexedadr( &((**h).listindex), 1, (Handle *)&hnew)) return(false); + #endif } else @@ -591,7 +633,9 @@ // if (!getindexedadr(&((**h).listindex), ctitems, (Handle *)&hlast)) // hlast = oprepeatedbump (down, ctitems - 1, (**ho).hsummit, false); #else + hlast = oprepeatedbump (down, ctitems - 1, (**ho).hsummit, false); + #endif // setstringlength (bs, 0); @@ -604,17 +648,19 @@ } #if OPLANGLISTACCEL == 1 // in oppushhandle() + // set value at index n if (!(**h).isrecord) if (!setindexedadr( &((**h).listindex), ctitems + 1, (Handle *)&hnew)) return(false); + #endif (**ho).ctexpanded++; (**hnew).flexpanded = true; } - #ifdef fldebug +#ifdef fldebug if (fldebugging) { @@ -654,10 +700,10 @@ error. */ - register hdllistrecord h = hlist; - register hdlheadrecord hstart; - register hdloutlinerecord ho; - register long ctitems; + hdllistrecord h = hlist; + hdlheadrecord hstart; + hdloutlinerecord ho; + long ctitems; hdlheadrecord hnew; bigstring bs; @@ -678,14 +724,17 @@ hnew = (**ho).hsummit; /*set this guy's refcon handle*/ opsetheadstring (hnew, bs); + #if OPLANGLISTACCEL == 1 // in opunshifthandle() + // set value at index 1 if (!setindexedadr( &((**h).listindex), 1, (Handle *)&hnew)) return(false); + #endif } - - else { + else + { hstart = (**ho).hsummit; if (!opaddheadline (hstart, up, bs, &hnew)) { @@ -696,9 +745,11 @@ } #if OPLANGLISTACCEL == 1 // in opunshifthandle() + // set value at index 1 if (!setindexedadr( &((**h).listindex), 0, (Handle *)&hnew)) return(false); + #endif (**ho).ctexpanded++; @@ -706,7 +757,7 @@ (**hnew).flexpanded = true; } - #ifdef fldebug +#ifdef fldebug if (fldebugging) { @@ -717,7 +768,7 @@ opsetheadstring (hnew, bs); } - #endif +#endif (**hnew).hrefcon = hdata; /*link in the user's data structure*/ @@ -1142,7 +1193,10 @@ disktomemshort (info.recordsize); // load remaining data in record - if (!loadfromhandle (hpacked, &ixload, min (sizeof (info), info.recordsize) - sizeof (info.recordsize), &info.versionnumber)) + if (!loadfromhandle (hpacked, + &ixload, + min (sizeof (info), info.recordsize) - sizeof (info.recordsize), + &info.versionnumber)) goto error; disktomemshort (info.versionnumber); @@ -1153,7 +1207,8 @@ disktomemlong (info.ctoutlinebytes); - if (info.versionnumber == 0x0100) // handle pre-swapped objects (unswap) - 2004-10-31 aradke: was 0x01000000 but that's not a short! + // handle pre-swapped objects (unswap) - 2004-10-31 aradke: was 0x01000000 but that's not a short! + if (info.versionnumber == 0x0100) info.versionnumber = 0x01; if (info.versionnumber != oplistversionnumber) { /*we only read version 1 format lists*/ @@ -1333,4 +1388,3 @@ return (true); } /*opvisitlist*/ - Modified: Frontier/branches/Int64/Common/source/strings.c =================================================================== --- Frontier/branches/Int64/Common/source/strings.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/strings.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -1951,7 +1951,71 @@ return (fl); } /*stringtoostype*/ +#if LONGINT_LONGDATE == 1 // hexstringtolonglongint() +boolean hexstringtolonglongint (bigstring bshex, tylonglongint *n) { + + tylonglongint x = 0; + char ch; + long i; + short len; + bigstring bs; + boolean fl = true; + boolean flsignextend = false; + + copystring (bshex, bs); + + stringdeletechars (bs, chspace); + + subtractstrings (bs, bshexprefix, bs); + + + //flsignextend = stringlength (bs) == 4; + len = stringlength (bs); + switch (len) + { + // case 2: // byte + case 4: // word + case 8: // long + flsignextend = true; + break; + } + + popleadingchars (bs, '0'); + + alllower (bs); + + len = min (stringlength (bs), 16); + + for (i = 1; i <= len; ++i) { + + x <<= 4; /*one nibble per character*/ + + ch = getstringcharacter (bs, i - 1); + + if (isxdigit (ch)) + x += hextoint (ch); + + else { + fl = false; + + break; + } + } + + if (flsignextend) { /*need so sign-extend as an integer*/ + + i = x; + + x = i; + } + + *n = x; + + return (fl); +} /*hexstringtolonglongint*/ + +#endif boolean hexstringtonumber (bigstring bshex, long *n) { register long x = 0; Modified: Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj =================================================================== --- Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj 2006-06-02 15:59:34 UTC (rev 1396) @@ -1000,34 +1000,6 @@ DEA58AB407435A9500BAB271 /* Frontier.icns in Resources */ = {isa = PBXBuildFile; fileRef = DEA58AB307435A9500BAB271 /* Frontier.icns */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - 6515255E072BFC6500411831 /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - REZ_PREPROCESSOR_DEFINITIONS = ""; - ZERO_LINK = NO; - }; - name = Development; - }; - 6515255F072BFC6500411831 /* Deployment */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_OPTIMIZATION_LEVEL = 2; - GCC_PREPROCESSOR_DEFINITIONS = NDEBUG; - ZERO_LINK = NO; - }; - name = Deployment; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ 65059B4E09968C1400410571 /* OPML.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OPML.app; sourceTree = BUILT_PRODUCTS_DIR; }; 65059B760996945100410571 /* OPML.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = OPML.icns; path = ../resources/OPML/OPML.icns; sourceTree = SOURCE_ROOT; }; @@ -1051,7 +1023,7 @@ 65152578072BFC6700411831 /* filemp3.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = filemp3.c; path = ../Common/source/filemp3.c; sourceTree = SOURCE_ROOT; }; 65152579072BFC6700411831 /* fileops.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fileops.c; path = ../Common/source/fileops.c; sourceTree = SOURCE_ROOT; }; 6515257A072BFC6700411831 /* filepath.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = filepath.c; path = ../Common/source/filepath.c; sourceTree = SOURCE_ROOT; }; - 6515257B072BFC6700411831 /* fileverbs.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fileverbs.c; path = ../Common/source/fileverbs.c; sourceTree = SOURCE_ROOT; }; + 6515257B072BFC6700411831 /* fileverbs.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fileverbs.c; path = ../Common/source/fileverbs.c; sourceTree = SOURCE_ROOT; wrapsLines = 1; }; 6515257C072BFC6700411831 /* findinfile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = findinfile.c; path = ../Common/source/findinfile.c; sourceTree = SOURCE_ROOT; }; 6515257D072BFC6700411831 /* resources.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = resources.c; path = ../Common/source/resources.c; sourceTree = SOURCE_ROOT; }; 6515257F072BFC6700411831 /* iac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = iac.c; path = ../FrontierSDK/Toolkits/IACTools/Source/iac.c; sourceTree = SOURCE_ROOT; }; @@ -1249,7 +1221,7 @@ 65152655072BFC6800411831 /* opinit.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = opinit.c; path = ../Common/source/opinit.c; sourceTree = SOURCE_ROOT; }; 65152656072BFC6800411831 /* oplangtext.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oplangtext.c; path = ../Common/source/oplangtext.c; sourceTree = SOURCE_ROOT; }; 65152657072BFC6800411831 /* oplineheight.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oplineheight.c; path = ../Common/source/oplineheight.c; sourceTree = SOURCE_ROOT; }; - 65152658072BFC6800411831 /* oplist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oplist.c; path = ../Common/source/oplist.c; sourceTree = SOURCE_ROOT; }; + 65152658072BFC6800411831 /* oplist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oplist.c; path = ../Common/source/oplist.c; sourceTree = SOURCE_ROOT; wrapsLines = 1; }; 65152659072BFC6800411831 /* opops.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = opops.c; path = ../Common/source/opops.c; sourceTree = SOURCE_ROOT; }; 6515265A072BFC6800411831 /* oppack.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oppack.c; path = ../Common/source/oppack.c; sourceTree = SOURCE_ROOT; }; 6515265B072BFC6800411831 /* oppopup.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oppopup.c; path = ../Common/source/oppopup.c; sourceTree = SOURCE_ROOT; }; @@ -1605,7 +1577,6 @@ 651525C3072BFC6700411831 /* Paige */, 651525C5072BFC6700411831 /* PCRE */, 651525CB072BFC6700411831 /* pict */, - 651525CE072BFC6700411831 /* rez */, 651525E1072BFC6700411831 /* tool */, 6515260D072BFC6700411831 /* _cancoon */, 65152614072BFC6700411831 /* _clay */, @@ -1618,6 +1589,7 @@ 65152683072BFC6800411831 /* _string */, 65152686072BFC6800411831 /* _table */, 65152696072BFC6800411831 /* _wp */, + 651525CE072BFC6700411831 /* rez */, 65123A7709D9C0C5005AB449 /* Build Scripts */, 651527B7072BFE0E00411831 /* Frameworks */, 65AF8D1A074159FC007C3205 /* Include Files */, @@ -2838,64 +2810,11 @@ ); buildRules = ( ); - buildSettings = { - GCC_ALTIVEC_EXTENSIONS = NO; - GCC_CHAR_IS_UNSIGNED_CHAR = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_ENABLE_ASM_KEYWORD = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = frontier.xcode.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "PIKE=1", - "OPMLEDITOR=1", - ); - GCC_REUSE_STRINGS = NO; - GCC_SHORT_ENUMS = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = NO; - GCC_WARN_UNUSED_LABEL = NO; - GCC_WARN_UNUSED_PARAMETER = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - INFOPLIST_FILE = Info_OPML.plist; - LIBRARY_SEARCH_PATHS = "\"tools\""; - OTHER_CFLAGS = ( - "-fno-inline", - "-malign-mac68k", - ); - OTHER_LDFLAGS = ( - "-multiply_defined", - warning, - ); - OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers -d PIKE=1 -d OPMLEDITOR=1"; - PRODUCT_NAME = OPML; - REZ_PREPROCESSOR_DEFINITIONS = ""; - REZ_PREPROCESSOR_UNDEFINITIONS = ""; - REZ_SCRIPT_TYPE = Roman; - REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - "-Wno-long-double", - ); - }; dependencies = ( ); name = OPML; productName = "Frontier OSX MachO Debug"; productReference = 65059B4E09968C1400410571 /* OPML.app */; - productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> -<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> -<plist version=\"1.0\"> -<dict/> -</plist> -"; productType = "com.apple.product-type.application"; }; 65152568072BFC6500411831 /* Frontier */ = { @@ -2912,60 +2831,11 @@ ); buildRules = ( ); - buildSettings = { - GCC_ALTIVEC_EXTENSIONS = NO; - GCC_CHAR_IS_UNSIGNED_CHAR = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_ENABLE_ASM_KEYWORD = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = frontier.xcode.h; - GCC_REUSE_STRINGS = NO; - GCC_SHORT_ENUMS = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = NO; - GCC_WARN_UNUSED_LABEL = NO; - GCC_WARN_UNUSED_PARAMETER = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - INFOPLIST_FILE = Info_Frontier.plist; - LIBRARY_SEARCH_PATHS = "\"tools\""; - OTHER_CFLAGS = ( - "-fno-inline", - "-malign-mac68k", - ); - OTHER_LDFLAGS = ( - "-multiply_defined", - warning, - ); - OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers"; - PRODUCT_NAME = Frontier; - REZ_PREPROCESSOR_DEFINITIONS = ""; - REZ_PREPROCESSOR_UNDEFINITIONS = ""; - REZ_SCRIPT_TYPE = Roman; - REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - "-Wno-long-double", - ); - }; dependencies = ( ); name = Frontier; productName = "Frontier OSX MachO Debug"; productReference = 65CF0C7F099545A4006E3A79 /* Frontier.app */; - productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> -<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> -<plist version=\"1.0\"> -<dict/> -</plist> -"; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -2974,12 +2844,6 @@ 65152560072BFC6500411831 /* Project object */ = { isa = PBXProject; buildConfigurationList = 657A823409F18A6100331344 /* Build configuration list for PBXProject "FrontierFat_i64" */; - buildSettings = { - }; - buildStyles = ( - 6515255E072BFC6500411831 /* Development */, - 6515255F072BFC6500411831 /* Deployment */, - ); hasScannedForEncodings = 1; mainGroup = 6515255C072BFC6500411831; productRefGroup = 6515255C072BFC6500411831; @@ -3875,15 +3739,20 @@ 657A823509F18A6100331344 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(NATIVE_ARCH)"; + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GCC_MODEL_TUNING = ""; + GCC_NO_COMMON_BLOCKS = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = frontier.xcode.h; GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = NO; + GCC_UNROLL_LOOPS = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; @@ -3903,6 +3772,7 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.4; + PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Development; @@ -3914,7 +3784,15 @@ ppc, i386, ); + GCC_AUTO_VECTORIZATION = YES; + GCC_DYNAMIC_NO_PIC = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_OPTIMIZATION_LEVEL = 3; + GCC_STRICT_ALIASING = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; + GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + MACOSX_DEPLOYMENT_TARGET = 10.4; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
