diff options
| author | Aleks Kissinger <aleks0@gmail.com> | 2013-08-29 11:45:27 +0100 |
|---|---|---|
| committer | Aleks Kissinger <aleks0@gmail.com> | 2013-08-29 11:45:27 +0100 |
| commit | 0503e5b446241da385607c6392c7a84ba743538d (patch) | |
| tree | df03ad752a7d9e91085c83858131ec8e55d9049c /tikzit | |
| parent | 1f995e9d45e31cb83f4616362e8b8bee4fd64b54 (diff) | |
fixed osx code and build to work with the new parser
Diffstat (limited to 'tikzit')
| -rw-r--r-- | tikzit/TikZiT.xcodeproj/project.pbxproj | 27 | ||||
| -rw-r--r-- | tikzit/src/osx/ParseErrorView.m | 2 | ||||
| -rw-r--r-- | tikzit/src/osx/TikzSourceController.m | 5 |
3 files changed, 31 insertions, 3 deletions
diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index 33d7495..01e63c7 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -141,6 +141,31 @@ 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXBuildRule section */ + 74112B2117CE36C500B9CF16 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + fileType = sourcecode.lex; + isEditable = 1; + outputFiles = ( + tikzlexer.m, + tikzlexer.h, + ); + script = "cd src\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\ncp common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; + }; + 74E535F317CE329A0040610D /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + fileType = sourcecode.yacc; + isEditable = 1; + outputFiles = ( + tikzparser.h, + tikzparser.m, + ); + script = "cd src\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\ncp common/${INPUT_FILE_BASE}.h common/${INPUT_FILE_BASE}.m ${DERIVED_SOURCES_DIR}\n"; + }; +/* End PBXBuildRule section */ + /* Begin PBXContainerItemProxy section */ 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -742,6 +767,8 @@ 8D15AC330486D014006FF6A4 /* Frameworks */, ); buildRules = ( + 74112B2117CE36C500B9CF16 /* PBXBuildRule */, + 74E535F317CE329A0040610D /* PBXBuildRule */, ); dependencies = ( ); diff --git a/tikzit/src/osx/ParseErrorView.m b/tikzit/src/osx/ParseErrorView.m index 97b1b94..83383f0 100644 --- a/tikzit/src/osx/ParseErrorView.m +++ b/tikzit/src/osx/ParseErrorView.m @@ -32,7 +32,7 @@ self.layer.backgroundColor = [[NSColor controlColor] CGColor]; //CGColorCreate(CGColorSpaceCreateDeviceRGB(), (CGFloat[]){ 1, .9, .64, 1 }); // newLayer.backgroundColor = [NSColor redColor].CGColor; - newLayer.frame = NSMakeRect(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height); + newLayer.frame = CGRectMake(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height); newLayer.position = CGPointMake(20,20); //[self.layer addSublayer:newLayer]; } diff --git a/tikzit/src/osx/TikzSourceController.m b/tikzit/src/osx/TikzSourceController.m index 0cb3703..737d771 100644 --- a/tikzit/src/osx/TikzSourceController.m +++ b/tikzit/src/osx/TikzSourceController.m @@ -150,9 +150,10 @@ [graphicsView setGraph:g]; [graphicsView refreshLayers]; [self doRevertTikz]; + return YES; + } else { + return NO; } - - return success; } - (void)doRevertTikz { |