colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-01 14:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into desktop

Browse Source
This commit is contained in:
Francisco Ryan Tolmasky I
2009-09-23 03:45:29 -07:00
parent 4993d16738 47694c2d80
commit 82df59e7dc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Objective-J/Tools/objj/lib-js/objj/objj.js
+2 -1
View File
@@ -37,7 +37,8 @@ with (window)
"OBJJ_PREPROCESSOR_DEBUG_SYMBOLS",
"objj_data",
"CPPropertyListCreateData", "CPPropertyListCreateFromData",
"kCFPropertyListXMLFormat_v1_0", "kCFPropertyList280NorthFormat_v1_0"
"kCFPropertyListXMLFormat_v1_0", "kCFPropertyList280NorthFormat_v1_0",
"objj_dictionary"
].forEach(function(v) {
exports[v] = eval(v);
});
Objective-J/Tools/objj/lib-js/objj/objjc.js
+3 -1
View File
@@ -45,7 +45,9 @@ exports.preprocess = function(inFile, outFile, flags, gccArgs)
shouldCheckSyntax = flags & OBJJ_PREPROCESSOR_SYNTAX,
shouldCompress = flags & OBJJ_PREPROCESSOR_COMPRESS;
var gccCommand = "gcc -E -x c -P " + (gccArgs.join(" ") || "") + " " + inFile;
gccArgs = gccArgs ? gccArgs.join(" ") : "";
var gccCommand = "gcc -E -x c -P " + gccArgs + " " + inFile;
if (!shouldObjjPreprocess)
{