diff --git a/PanoPainter-OSX/main.cpp b/PanoPainter-OSX/main.cpp index 7921903..d417c47 100644 --- a/PanoPainter-OSX/main.cpp +++ b/PanoPainter-OSX/main.cpp @@ -465,7 +465,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTime auto style = NSTitledWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask|NSClosableWindowMask; window = [[Window alloc] initWithContentRect:r styleMask:style backing:NSBackingStoreBuffered defer:NO]; [window setDelegate:controller]; - [window setTitle:@"PanoPainter 0.1.2 alpha"]; + [window setTitle:[NSString stringWithUTF8String:g_window_title]]; [window center]; [window makeKeyAndOrderFront:controller]; [window setContentView:view]; diff --git a/engine.xcodeproj/project.pbxproj b/PanoPainter.xcodeproj/project.pbxproj similarity index 86% rename from engine.xcodeproj/project.pbxproj rename to PanoPainter.xcodeproj/project.pbxproj index f69ed59..bc89840 100644 --- a/engine.xcodeproj/project.pbxproj +++ b/PanoPainter.xcodeproj/project.pbxproj @@ -7,23 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - AD02F0C21EDC456800B2E692 /* sequencer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD02F0C01EDC456800B2E692 /* sequencer.cpp */; }; AD02F0C31EDC457C00B2E692 /* sequencer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD02F0C01EDC456800B2E692 /* sequencer.cpp */; }; AD02F0C41EDC457C00B2E692 /* sequencer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD02F0C01EDC456800B2E692 /* sequencer.cpp */; }; AD06989720CC6C350010825F /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD06989620CC6C350010825F /* ZipArchive.framework */; }; AD06989A20CC6C4C0010825F /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD06989920CC6C4C0010825F /* ZipArchive.framework */; }; AD06989B20CC84DB0010825F /* ZipArchive.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD06989920CC6C4C0010825F /* ZipArchive.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; AD06989D20CC894B0010825F /* ZipArchive.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD06989620CC6C350010825F /* ZipArchive.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - AD0E11971ECA20F200CDA6BB /* app_events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11921ECA20F200CDA6BB /* app_events.cpp */; }; - AD0E11981ECA20F200CDA6BB /* app_layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11931ECA20F200CDA6BB /* app_layout.cpp */; }; - AD0E11991ECA20F200CDA6BB /* app_shaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11941ECA20F200CDA6BB /* app_shaders.cpp */; }; - AD0E119A1ECA20F200CDA6BB /* node_scroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11951ECA20F200CDA6BB /* node_scroll.cpp */; }; AD0E119B1ECA215600CDA6BB /* node_scroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11951ECA20F200CDA6BB /* node_scroll.cpp */; }; AD0E119C1ECA215600CDA6BB /* app_events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11921ECA20F200CDA6BB /* app_events.cpp */; }; AD0E119D1ECA215600CDA6BB /* app_layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11931ECA20F200CDA6BB /* app_layout.cpp */; }; AD0E119E1ECA215600CDA6BB /* app_shaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11941ECA20F200CDA6BB /* app_shaders.cpp */; }; - AD0E11A11ECA619F00CDA6BB /* jpgd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E119F1ECA619F00CDA6BB /* jpgd.cpp */; }; - AD0E11A31ECA61B500CDA6BB /* jpge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11A21ECA61B500CDA6BB /* jpge.cpp */; }; AD0E11A41ECA61B900CDA6BB /* jpge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E11A21ECA61B500CDA6BB /* jpge.cpp */; }; AD0E11A51ECA61B900CDA6BB /* jpgd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E119F1ECA619F00CDA6BB /* jpgd.cpp */; }; AD0E5CA31ECC6F2B00C35669 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD0E5CA21ECC6F2B00C35669 /* main.cpp */; }; @@ -84,29 +77,6 @@ AD0E5CE21ECC72AD00C35669 /* texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0691E2A774F006ACC15 /* texture.cpp */; }; AD0E5CE31ECC72AD00C35669 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADB61C801E3D38450093280F /* util.cpp */; }; AD0E5CE41ECC76BA00C35669 /* data in Resources */ = {isa = PBXBuildFile; fileRef = AD58E0611E17F23D006ACC15 /* data */; }; - AD10637F1EC7ADFA002A525F /* node_border.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063511EC7ADFA002A525F /* node_border.cpp */; }; - AD1063801EC7ADFA002A525F /* node_button_custom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063531EC7ADFA002A525F /* node_button_custom.cpp */; }; - AD1063811EC7ADFA002A525F /* node_button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063551EC7ADFA002A525F /* node_button.cpp */; }; - AD1063821EC7ADFA002A525F /* node_canvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063571EC7ADFA002A525F /* node_canvas.cpp */; }; - AD1063831EC7ADFA002A525F /* node_checkbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063591EC7ADFA002A525F /* node_checkbox.cpp */; }; - AD1063841EC7ADFA002A525F /* node_color_quad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10635B1EC7ADFA002A525F /* node_color_quad.cpp */; }; - AD1063851EC7ADFA002A525F /* node_dialog_open.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10635D1EC7ADFA002A525F /* node_dialog_open.cpp */; }; - AD1063861EC7ADFA002A525F /* node_icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10635F1EC7ADFA002A525F /* node_icon.cpp */; }; - AD1063871EC7ADFA002A525F /* node_image_texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063611EC7ADFA002A525F /* node_image_texture.cpp */; }; - AD1063881EC7ADFA002A525F /* node_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063631EC7ADFA002A525F /* node_image.cpp */; }; - AD1063891EC7ADFA002A525F /* node_message_box.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063651EC7ADFA002A525F /* node_message_box.cpp */; }; - AD10638A1EC7ADFA002A525F /* node_panel_brush.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063671EC7ADFA002A525F /* node_panel_brush.cpp */; }; - AD10638B1EC7ADFA002A525F /* node_panel_color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063691EC7ADFA002A525F /* node_panel_color.cpp */; }; - AD10638C1EC7ADFA002A525F /* node_panel_layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10636B1EC7ADFA002A525F /* node_panel_layer.cpp */; }; - AD10638D1EC7ADFA002A525F /* node_panel_stroke.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10636D1EC7ADFA002A525F /* node_panel_stroke.cpp */; }; - AD10638E1EC7ADFA002A525F /* node_popup_menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10636F1EC7ADFA002A525F /* node_popup_menu.cpp */; }; - AD10638F1EC7ADFA002A525F /* node_settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063711EC7ADFA002A525F /* node_settings.cpp */; }; - AD1063901EC7ADFA002A525F /* node_slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063731EC7ADFA002A525F /* node_slider.cpp */; }; - AD1063911EC7ADFA002A525F /* node_stroke_preview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063751EC7ADFA002A525F /* node_stroke_preview.cpp */; }; - AD1063921EC7ADFA002A525F /* node_text_input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063771EC7ADFA002A525F /* node_text_input.cpp */; }; - AD1063931EC7ADFA002A525F /* node_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063791EC7ADFA002A525F /* node_text.cpp */; }; - AD1063941EC7ADFA002A525F /* node_viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10637B1EC7ADFA002A525F /* node_viewport.cpp */; }; - AD1063951EC7ADFA002A525F /* node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10637D1EC7ADFA002A525F /* node.cpp */; }; AD1063961EC7AE92002A525F /* node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10637D1EC7ADFA002A525F /* node.cpp */; }; AD1063971EC7AE92002A525F /* node_border.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063511EC7ADFA002A525F /* node_border.cpp */; }; AD1063981EC7AE92002A525F /* node_button_custom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063531EC7ADFA002A525F /* node_button_custom.cpp */; }; @@ -130,37 +100,17 @@ AD1063AA1EC7AE92002A525F /* node_text_input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063771EC7ADFA002A525F /* node_text_input.cpp */; }; AD1063AB1EC7AE92002A525F /* node_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1063791EC7ADFA002A525F /* node_text.cpp */; }; AD1063AC1EC7AE92002A525F /* node_viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD10637B1EC7ADFA002A525F /* node_viewport.cpp */; }; - AD29CC621EA2B214008C8BFA /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD29CC601EA2B214008C8BFA /* action.cpp */; }; + AD2286C2214E9A0F0074567E /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD2286C0214E991A0074567E /* version.cpp */; }; + AD2286C3214E9A2B0074567E /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD2286C0214E991A0074567E /* version.cpp */; }; AD3087C2205F016F009F9260 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD3087C1205F016F009F9260 /* AVFoundation.framework */; }; AD3087C4205F0177009F9260 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD3087C3205F0177009F9260 /* AVFoundation.framework */; }; AD3087C62061D1B4009F9260 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD3087C52061D1B3009F9260 /* CoreVideo.framework */; }; AD3087C82061D1CD009F9260 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD3087C72061D1CD009F9260 /* CoreGraphics.framework */; }; AD30D82F1F783E0100B6A112 /* libcurl.4.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = AD30D82E1F783E0100B6A112 /* libcurl.4.tbd */; }; AD30D8331F8049BD00B6A112 /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD30D8321F8049BC00B6A112 /* Photos.framework */; }; - AD3B1EC01E3B8B7600E918E3 /* layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD3B1EBE1E3B8B7600E918E3 /* layout.cpp */; }; - AD4C08D91E89BD0F0051D85F /* asset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4C08CF1E89BD0F0051D85F /* asset.cpp */; }; - AD4C08DA1E89BD0F0051D85F /* bezier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4C08D11E89BD0F0051D85F /* bezier.cpp */; }; - AD4C08DB1E89BD0F0051D85F /* brush.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4C08D31E89BD0F0051D85F /* brush.cpp */; }; - AD4C08DC1E89BD0F0051D85F /* canvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4C08D51E89BD0F0051D85F /* canvas.cpp */; }; - AD4C08DD1E89BD0F0051D85F /* rtt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4C08D71E89BD0F0051D85F /* rtt.cpp */; }; AD5016591EBFC7F00079A826 /* data in Resources */ = {isa = PBXBuildFile; fileRef = AD58E0611E17F23D006ACC15 /* data */; }; - AD58E05A1E10752E006ACC15 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD58E0591E10752E006ACC15 /* OpenGL.framework */; }; - AD58E05C1E107536006ACC15 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD58E05B1E107536006ACC15 /* Cocoa.framework */; }; - AD58E05E1E10754F006ACC15 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD58E05D1E10754F006ACC15 /* CoreFoundation.framework */; }; - AD58E0601E12DA86006ACC15 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD58E05F1E12DA86006ACC15 /* CoreVideo.framework */; }; - AD58E0621E17F249006ACC15 /* data in CopyFiles */ = {isa = PBXBuildFile; fileRef = AD58E0611E17F23D006ACC15 /* data */; }; - AD58E0651E2A76FD006ACC15 /* shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0631E2A76FD006ACC15 /* shader.cpp */; }; - AD58E0681E2A7741006ACC15 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0661E2A7741006ACC15 /* image.cpp */; }; - AD58E06B1E2A774F006ACC15 /* texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0691E2A774F006ACC15 /* texture.cpp */; }; - AD58E06F1E2A80BC006ACC15 /* shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD58E06D1E2A80BC006ACC15 /* shape.cpp */; }; - AD58E0721E2A90EF006ACC15 /* app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0701E2A90EF006ACC15 /* app.cpp */; }; - AD58E0761E3421F2006ACC15 /* YGNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0741E3421F2006ACC15 /* YGNodeList.c */; }; - AD58E0771E3421F2006ACC15 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0751E3421F2006ACC15 /* Yoga.c */; }; - AD58E0791E342205006ACC15 /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD58E0781E342205006ACC15 /* tinyxml2.cpp */; }; - AD74030E1FB9D0C0004ACFCC /* node_combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD74030D1FB9D0C0004ACFCC /* node_combobox.cpp */; }; AD74030F1FB9D0D3004ACFCC /* node_combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD74030D1FB9D0C0004ACFCC /* node_combobox.cpp */; }; AD7403101FB9D0D4004ACFCC /* node_combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD74030D1FB9D0C0004ACFCC /* node_combobox.cpp */; }; - AD744B6E1EBC9EF800B66E30 /* canvas_modes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD744B6C1EBC9EF700B66E30 /* canvas_modes.cpp */; }; AD759B681F2796EA00211963 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD759B671F2796EA00211963 /* OpenGLES.framework */; }; AD759B691F279B3900211963 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD759B661F27964D00211963 /* GLKit.framework */; }; AD787ADF20D4611100C4712A /* QuickLook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD787ADE20D4611100C4712A /* QuickLook.framework */; }; @@ -171,36 +121,22 @@ AD787AFB20D4637E00C4712A /* PanoThumb.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = AD787AF320D4637E00C4712A /* PanoThumb.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; AD787AFF20D5AD1500C4712A /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD06989620CC6C350010825F /* ZipArchive.framework */; }; AD787B0020D5AD1700C4712A /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD06989620CC6C350010825F /* ZipArchive.framework */; }; - AD8CF7211E913F0500083FFD /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD8CF71F1E913F0500083FFD /* log.cpp */; }; - AD95AEC61E41EDEC002DD03A /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD95AEC31E41EDEC002DD03A /* font.cpp */; }; - AD95AEC71E41EDEC002DD03A /* pch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD95AEC51E41EDEC002DD03A /* pch.cpp */; }; - ADB1C3DA1EA3A156009A65BD /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADB1C3D81EA3A156009A65BD /* event.cpp */; }; - ADB61C821E3D38450093280F /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADB61C801E3D38450093280F /* util.cpp */; }; - ADBC8C4A1FAE7CC40094B339 /* node_dialog_browse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C471FAE7CC20094B339 /* node_dialog_browse.cpp */; }; - ADBC8C4B1FAE7CC40094B339 /* app_commands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C481FAE7CC30094B339 /* app_commands.cpp */; }; ADBC8C4E1FAE7D360094B339 /* node_dialog_browse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C471FAE7CC20094B339 /* node_dialog_browse.cpp */; }; ADBC8C4F1FAE7D370094B339 /* node_dialog_browse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C471FAE7CC20094B339 /* node_dialog_browse.cpp */; }; - ADBC8C531FAFD0370094B339 /* app_cloud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C511FAFD0360094B339 /* app_cloud.cpp */; }; - ADBC8C541FAFD0370094B339 /* node_dialog_cloud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C521FAFD0370094B339 /* node_dialog_cloud.cpp */; }; ADBC8C551FAFD0520094B339 /* app_cloud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C511FAFD0360094B339 /* app_cloud.cpp */; }; ADBC8C561FAFD0530094B339 /* app_cloud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C511FAFD0360094B339 /* app_cloud.cpp */; }; ADBC8C571FAFD05A0094B339 /* node_dialog_cloud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C521FAFD0370094B339 /* node_dialog_cloud.cpp */; }; ADBC8C581FAFD05A0094B339 /* node_dialog_cloud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C521FAFD0370094B339 /* node_dialog_cloud.cpp */; }; - ADC0EB3D1FBDC748004079BB /* node_colorwheel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC0EB3B1FBDC748004079BB /* node_colorwheel.cpp */; }; ADC0EB3E1FBDC748004079BB /* node_colorwheel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC0EB3B1FBDC748004079BB /* node_colorwheel.cpp */; }; ADC0EB3F1FBDC748004079BB /* node_colorwheel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC0EB3B1FBDC748004079BB /* node_colorwheel.cpp */; }; - ADC0EB421FC36E88004079BB /* node_dialog_picker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC0EB401FC36E88004079BB /* node_dialog_picker.cpp */; }; ADC0EB431FC36E88004079BB /* node_dialog_picker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC0EB401FC36E88004079BB /* node_dialog_picker.cpp */; }; ADC0EB441FC36E88004079BB /* node_dialog_picker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC0EB401FC36E88004079BB /* node_dialog_picker.cpp */; }; ADC6F4621F3AFF2C004177FA /* node_dialog_layer_rename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */; }; ADC6F4631F3AFF2D004177FA /* node_dialog_layer_rename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */; }; - ADC6F4641F3AFF2E004177FA /* node_dialog_layer_rename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */; }; - ADC6F4661F3E66FB004177FA /* app_dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */; }; ADC6F4671F3E66FB004177FA /* app_dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */; }; ADC6F4681F3E66FB004177FA /* app_dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */; }; ADD6AFD71F94DEB000E92461 /* node_progress_bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD6AFD61F94DEAF00E92461 /* node_progress_bar.cpp */; }; ADD6AFD81F94DEB000E92461 /* node_progress_bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD6AFD61F94DEAF00E92461 /* node_progress_bar.cpp */; }; - ADD6AFDA1F94DEB900E92461 /* node_progress_bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD6AFD61F94DEAF00E92461 /* node_progress_bar.cpp */; }; ADD7D26F1EBF9AE300D5A897 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = ADD7D26E1EBF9AE300D5A897 /* main.m */; }; ADD7D2721EBF9AE300D5A897 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = ADD7D2711EBF9AE300D5A897 /* AppDelegate.m */; }; ADD7D2791EBF9AE300D5A897 /* GameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ADD7D2781EBF9AE300D5A897 /* GameViewController.m */; }; @@ -238,7 +174,6 @@ ADE0862F21239C9200945972 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE0862E21239C9100945972 /* AudioToolbox.framework */; }; ADE0863121239CDA00945972 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE0863021239CD900945972 /* MediaPlayer.framework */; }; ADE0863321239D0700945972 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE0863221239D0700945972 /* Accelerate.framework */; }; - ADE22BE5211904AB00D5F44B /* node_panel_grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE22BE3211904AA00D5F44B /* node_panel_grid.cpp */; }; ADE22BE6211904AB00D5F44B /* node_panel_grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE22BE3211904AA00D5F44B /* node_panel_grid.cpp */; }; ADE22BE7211904AB00D5F44B /* node_panel_grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADE22BE3211904AA00D5F44B /* node_panel_grid.cpp */; }; ADE491161F86E65D00FB8E92 /* advancing_front.cc in Sources */ = {isa = PBXBuildFile; fileRef = ADE491121F86D09100FB8E92 /* advancing_front.cc */; }; @@ -293,16 +228,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - AD58E04D1E107411006ACC15 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 12; - dstPath = ""; - dstSubfolderSpec = 7; - files = ( - AD58E0621E17F249006ACC15 /* data in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; AD787AEE20D4611100C4712A /* Embed App Extensions */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -380,6 +305,9 @@ AD10637C1EC7ADFA002A525F /* node_viewport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_viewport.h; sourceTree = ""; }; AD10637D1EC7ADFA002A525F /* node.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node.cpp; sourceTree = ""; }; AD10637E1EC7ADFA002A525F /* node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node.h; sourceTree = ""; }; + AD2286BE214E975D0074567E /* pre-build.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = "pre-build.py"; path = "scripts/pre-build.py"; sourceTree = SOURCE_ROOT; }; + AD2286BF214E99190074567E /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; }; + AD2286C0214E991A0074567E /* version.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = version.cpp; sourceTree = ""; }; AD29CC601EA2B214008C8BFA /* action.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = action.cpp; sourceTree = ""; }; AD29CC611EA2B214008C8BFA /* action.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = action.h; sourceTree = ""; }; AD2FEBDA1F94A742002804DD /* main.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = ""; }; @@ -401,7 +329,6 @@ AD4C08D61E89BD0F0051D85F /* canvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canvas.h; sourceTree = ""; }; AD4C08D71E89BD0F0051D85F /* rtt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rtt.cpp; sourceTree = ""; }; AD4C08D81E89BD0F0051D85F /* rtt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rtt.h; sourceTree = ""; }; - AD58E04F1E107411006ACC15 /* engine */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = engine; sourceTree = BUILT_PRODUCTS_DIR; }; AD58E0521E107411006ACC15 /* main.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; path = main.cpp; sourceTree = ""; }; AD58E0591E10752E006ACC15 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; AD58E05B1E107536006ACC15 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; @@ -492,10 +419,10 @@ ADE491131F86D09100FB8E92 /* sweep.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sweep.cc; path = libs/poly2tri/poly2tri/sweep/sweep.cc; sourceTree = ""; }; ADE491141F86D09100FB8E92 /* sweep_context.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sweep_context.cc; path = libs/poly2tri/poly2tri/sweep/sweep_context.cc; sourceTree = ""; }; ADE491151F86D09100FB8E92 /* cdt.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cdt.cc; path = libs/poly2tri/poly2tri/sweep/cdt.cc; sourceTree = ""; }; - ADEBA9042069A4F30085AE16 /* objc_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = objc_utils.h; path = engine/objc_utils.h; sourceTree = SOURCE_ROOT; }; - ADEBA9052069A4F40085AE16 /* objc_utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = objc_utils.cpp; path = engine/objc_utils.cpp; sourceTree = SOURCE_ROOT; }; - ADEBA9072069A50E0085AE16 /* objc_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = objc_utils.h; path = engine/objc_utils.h; sourceTree = SOURCE_ROOT; }; - ADEBA9082069A50E0085AE16 /* objc_utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = objc_utils.cpp; path = engine/objc_utils.cpp; sourceTree = SOURCE_ROOT; }; + ADEBA9042069A4F30085AE16 /* objc_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = objc_utils.h; path = src/objc_utils.h; sourceTree = SOURCE_ROOT; }; + ADEBA9052069A4F40085AE16 /* objc_utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = objc_utils.cpp; path = src/objc_utils.cpp; sourceTree = SOURCE_ROOT; }; + ADEBA9072069A50E0085AE16 /* objc_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = objc_utils.h; path = src/objc_utils.h; sourceTree = SOURCE_ROOT; }; + ADEBA9082069A50E0085AE16 /* objc_utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = objc_utils.cpp; path = src/objc_utils.cpp; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -513,17 +440,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - AD58E04C1E107411006ACC15 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - AD58E0601E12DA86006ACC15 /* CoreVideo.framework in Frameworks */, - AD58E05E1E10754F006ACC15 /* CoreFoundation.framework in Frameworks */, - AD58E05C1E107536006ACC15 /* Cocoa.framework in Frameworks */, - AD58E05A1E10752E006ACC15 /* OpenGL.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; AD787ADA20D4611100C4712A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -682,12 +598,21 @@ name = ui; sourceTree = ""; }; + AD2286BC214E97460074567E /* scripts */ = { + isa = PBXGroup; + children = ( + AD2286BE214E975D0074567E /* pre-build.py */, + ); + path = scripts; + sourceTree = ""; + }; AD58E0461E107411006ACC15 = { isa = PBXGroup; children = ( + AD2286BC214E97460074567E /* scripts */, AD58E0731E3421CB006ACC15 /* libs */, AD58E0611E17F23D006ACC15 /* data */, - AD58E0511E107411006ACC15 /* engine */, + AD58E0511E107411006ACC15 /* src */, ADD7D26C1EBF9AE300D5A897 /* PanoPainter */, AD0E5C9D1ECC6F2B00C35669 /* PanoPainter-OSX */, AD787AE020D4611100C4712A /* PanoQL */, @@ -700,7 +625,6 @@ AD58E0501E107411006ACC15 /* Products */ = { isa = PBXGroup; children = ( - AD58E04F1E107411006ACC15 /* engine */, ADD7D26B1EBF9AE300D5A897 /* PanoPainter.app */, AD0E5C9C1ECC6F2B00C35669 /* PanoPainter.app */, AD787ADD20D4611100C4712A /* PanoQL.appex */, @@ -709,7 +633,7 @@ name = Products; sourceTree = ""; }; - AD58E0511E107411006ACC15 /* engine */ = { + AD58E0511E107411006ACC15 /* src */ = { isa = PBXGroup; children = ( AD1063501EC7ADDE002A525F /* ui */, @@ -756,9 +680,11 @@ AD58E06A1E2A774F006ACC15 /* texture.h */, ADB61C801E3D38450093280F /* util.cpp */, ADB61C811E3D38450093280F /* util.h */, + AD2286C0214E991A0074567E /* version.cpp */, + AD2286BF214E99190074567E /* version.h */, AD58E0521E107411006ACC15 /* main.cpp */, ); - path = engine; + path = src; sourceTree = ""; }; AD58E0731E3421CB006ACC15 /* libs */ = { @@ -871,9 +797,11 @@ isa = PBXNativeTarget; buildConfigurationList = AD0E5CAC1ECC6F2B00C35669 /* Build configuration list for PBXNativeTarget "PanoPainter-OSX" */; buildPhases = ( + ADB86F64214E9D0D004E7CB8 /* Generate Version */, AD0E5C981ECC6F2B00C35669 /* Sources */, AD0E5C991ECC6F2B00C35669 /* Frameworks */, AD0E5C9A1ECC6F2B00C35669 /* Resources */, + AD2286BB214E96E60074567E /* Versioning Info.plist */, AD30D8201F783B5600B6A112 /* CopyFiles */, ); buildRules = ( @@ -885,23 +813,6 @@ productReference = AD0E5C9C1ECC6F2B00C35669 /* PanoPainter.app */; productType = "com.apple.product-type.application"; }; - AD58E04E1E107411006ACC15 /* engine */ = { - isa = PBXNativeTarget; - buildConfigurationList = AD58E0561E107411006ACC15 /* Build configuration list for PBXNativeTarget "engine" */; - buildPhases = ( - AD58E04B1E107411006ACC15 /* Sources */, - AD58E04C1E107411006ACC15 /* Frameworks */, - AD58E04D1E107411006ACC15 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = engine; - productName = engine; - productReference = AD58E04F1E107411006ACC15 /* engine */; - productType = "com.apple.product-type.tool"; - }; AD787ADC20D4611100C4712A /* PanoQL */ = { isa = PBXNativeTarget; buildConfigurationList = AD787AEB20D4611100C4712A /* Build configuration list for PBXNativeTarget "PanoQL" */; @@ -940,9 +851,11 @@ isa = PBXNativeTarget; buildConfigurationList = ADD7D2851EBF9AE300D5A897 /* Build configuration list for PBXNativeTarget "PanoPainter" */; buildPhases = ( + ADB86F65214EFBCD004E7CB8 /* Generate Version */, ADD7D2671EBF9AE300D5A897 /* Sources */, ADD7D2681EBF9AE300D5A897 /* Frameworks */, ADD7D2691EBF9AE300D5A897 /* Resources */, + ADB86F66214EFC04004E7CB8 /* Versioning Info.plist */, AD06989C20CC89370010825F /* CopyFiles */, AD787AEE20D4611100C4712A /* Embed App Extensions */, ); @@ -963,7 +876,7 @@ AD58E0471E107411006ACC15 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0720; + LastUpgradeCheck = 0940; ORGANIZATIONNAME = "OmixLab ltd"; TargetAttributes = { AD0E5C9B1ECC6F2B00C35669 = { @@ -971,11 +884,6 @@ DevelopmentTeam = ERD9AYQ49S; ProvisioningStyle = Automatic; }; - AD58E04E1E107411006ACC15 = { - CreatedOnToolsVersion = 7.2; - DevelopmentTeam = A6Y3VHN7V9; - ProvisioningStyle = Automatic; - }; AD787ADC20D4611100C4712A = { CreatedOnToolsVersion = 9.4.1; DevelopmentTeam = ERD9AYQ49S; @@ -992,7 +900,7 @@ }; }; }; - buildConfigurationList = AD58E04A1E107411006ACC15 /* Build configuration list for PBXProject "engine" */; + buildConfigurationList = AD58E04A1E107411006ACC15 /* Build configuration list for PBXProject "PanoPainter" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -1005,7 +913,6 @@ projectDirPath = ""; projectRoot = ""; targets = ( - AD58E04E1E107411006ACC15 /* engine */, ADD7D26A1EBF9AE300D5A897 /* PanoPainter */, AD0E5C9B1ECC6F2B00C35669 /* PanoPainter-OSX */, AD787ADC20D4611100C4712A /* PanoQL */, @@ -1053,6 +960,65 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + AD2286BB214E96E60074567E /* Versioning Info.plist */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Versioning Info.plist"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Use the commit count as CFBundleVersion\nGIT_COMMIT_COUNT=`git rev-list --count HEAD`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion ${GIT_COMMIT_COUNT}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n\n## Use the last annotated tag as CFBundleShortVersionString\nGIT_TAG=`git describe --tags --abbrev=0`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString ${GIT_TAG}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n"; + }; + ADB86F64214E9D0D004E7CB8 /* Generate Version */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Generate Version"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "python scripts/pre-build.py $CONFIGURATION"; + }; + ADB86F65214EFBCD004E7CB8 /* Generate Version */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Generate Version"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "python scripts/pre-build.py $CONFIGURATION"; + }; + ADB86F66214EFC04004E7CB8 /* Versioning Info.plist */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Versioning Info.plist"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Use the commit count as CFBundleVersion\nGIT_COMMIT_COUNT=`git rev-list --count HEAD`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion ${GIT_COMMIT_COUNT}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n\n## Use the last annotated tag as CFBundleShortVersionString\nGIT_TAG=`git describe --tags --abbrev=0`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString ${GIT_TAG}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ AD0E5C981ECC6F2B00C35669 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -1085,6 +1051,7 @@ AD0E5CCA1ECC72AD00C35669 /* node_slider.cpp in Sources */, AD0E5CCE1ECC72AD00C35669 /* node_text.cpp in Sources */, AD0E5CDC1ECC72AD00C35669 /* image.cpp in Sources */, + AD2286C2214E9A0F0074567E /* version.cpp in Sources */, AD0E5CE01ECC72AD00C35669 /* shader.cpp in Sources */, ADC0EB3F1FBDC748004079BB /* node_colorwheel.cpp in Sources */, AD0E5CDD1ECC72AD00C35669 /* log.cpp in Sources */, @@ -1129,75 +1096,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - AD58E04B1E107411006ACC15 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - AD58E0791E342205006ACC15 /* tinyxml2.cpp in Sources */, - AD10638B1EC7ADFA002A525F /* node_panel_color.cpp in Sources */, - AD10638C1EC7ADFA002A525F /* node_panel_layer.cpp in Sources */, - ADBC8C4B1FAE7CC40094B339 /* app_commands.cpp in Sources */, - AD29CC621EA2B214008C8BFA /* action.cpp in Sources */, - AD1063891EC7ADFA002A525F /* node_message_box.cpp in Sources */, - AD10638A1EC7ADFA002A525F /* node_panel_brush.cpp in Sources */, - AD1063801EC7ADFA002A525F /* node_button_custom.cpp in Sources */, - ADC6F4661F3E66FB004177FA /* app_dialogs.cpp in Sources */, - AD58E06F1E2A80BC006ACC15 /* shape.cpp in Sources */, - AD58E0651E2A76FD006ACC15 /* shader.cpp in Sources */, - AD4C08DA1E89BD0F0051D85F /* bezier.cpp in Sources */, - AD74030E1FB9D0C0004ACFCC /* node_combobox.cpp in Sources */, - AD0E11991ECA20F200CDA6BB /* app_shaders.cpp in Sources */, - ADBC8C531FAFD0370094B339 /* app_cloud.cpp in Sources */, - ADD6AFDA1F94DEB900E92461 /* node_progress_bar.cpp in Sources */, - AD10638F1EC7ADFA002A525F /* node_settings.cpp in Sources */, - AD10638D1EC7ADFA002A525F /* node_panel_stroke.cpp in Sources */, - AD1063841EC7ADFA002A525F /* node_color_quad.cpp in Sources */, - ADC0EB421FC36E88004079BB /* node_dialog_picker.cpp in Sources */, - AD1063881EC7ADFA002A525F /* node_image.cpp in Sources */, - AD58E0761E3421F2006ACC15 /* YGNodeList.c in Sources */, - AD744B6E1EBC9EF800B66E30 /* canvas_modes.cpp in Sources */, - AD0E11971ECA20F200CDA6BB /* app_events.cpp in Sources */, - AD0E119A1ECA20F200CDA6BB /* node_scroll.cpp in Sources */, - AD10638E1EC7ADFA002A525F /* node_popup_menu.cpp in Sources */, - ADB61C821E3D38450093280F /* util.cpp in Sources */, - AD10637F1EC7ADFA002A525F /* node_border.cpp in Sources */, - AD1063921EC7ADFA002A525F /* node_text_input.cpp in Sources */, - AD4C08DD1E89BD0F0051D85F /* rtt.cpp in Sources */, - AD1063931EC7ADFA002A525F /* node_text.cpp in Sources */, - AD58E06B1E2A774F006ACC15 /* texture.cpp in Sources */, - AD1063831EC7ADFA002A525F /* node_checkbox.cpp in Sources */, - AD3B1EC01E3B8B7600E918E3 /* layout.cpp in Sources */, - AD58E0721E2A90EF006ACC15 /* app.cpp in Sources */, - AD02F0C21EDC456800B2E692 /* sequencer.cpp in Sources */, - AD4C08DC1E89BD0F0051D85F /* canvas.cpp in Sources */, - AD95AEC61E41EDEC002DD03A /* font.cpp in Sources */, - AD1063911EC7ADFA002A525F /* node_stroke_preview.cpp in Sources */, - AD0E11A31ECA61B500CDA6BB /* jpge.cpp in Sources */, - AD1063811EC7ADFA002A525F /* node_button.cpp in Sources */, - ADB1C3DA1EA3A156009A65BD /* event.cpp in Sources */, - ADC0EB3D1FBDC748004079BB /* node_colorwheel.cpp in Sources */, - AD4C08D91E89BD0F0051D85F /* asset.cpp in Sources */, - AD1063851EC7ADFA002A525F /* node_dialog_open.cpp in Sources */, - AD58E0681E2A7741006ACC15 /* image.cpp in Sources */, - AD0E11A11ECA619F00CDA6BB /* jpgd.cpp in Sources */, - ADC6F4641F3AFF2E004177FA /* node_dialog_layer_rename.cpp in Sources */, - AD1063901EC7ADFA002A525F /* node_slider.cpp in Sources */, - AD0E11981ECA20F200CDA6BB /* app_layout.cpp in Sources */, - AD58E0771E3421F2006ACC15 /* Yoga.c in Sources */, - AD4C08DB1E89BD0F0051D85F /* brush.cpp in Sources */, - AD1063951EC7ADFA002A525F /* node.cpp in Sources */, - ADBC8C4A1FAE7CC40094B339 /* node_dialog_browse.cpp in Sources */, - AD1063871EC7ADFA002A525F /* node_image_texture.cpp in Sources */, - AD1063941EC7ADFA002A525F /* node_viewport.cpp in Sources */, - ADE22BE5211904AB00D5F44B /* node_panel_grid.cpp in Sources */, - AD8CF7211E913F0500083FFD /* log.cpp in Sources */, - AD95AEC71E41EDEC002DD03A /* pch.cpp in Sources */, - AD1063861EC7ADFA002A525F /* node_icon.cpp in Sources */, - AD1063821EC7ADFA002A525F /* node_canvas.cpp in Sources */, - ADBC8C541FAFD0370094B339 /* node_dialog_cloud.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; AD787AD920D4611100C4712A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1243,6 +1141,7 @@ ADD7D29F1EBF9E1C00D5A897 /* app.cpp in Sources */, AD1063A41EC7AE92002A525F /* node_panel_layer.cpp in Sources */, AD1063AA1EC7AE92002A525F /* node_text_input.cpp in Sources */, + AD2286C3214E9A2B0074567E /* version.cpp in Sources */, ADC0EB3E1FBDC748004079BB /* node_colorwheel.cpp in Sources */, ADD6AFD81F94DEB000E92461 /* node_progress_bar.cpp in Sources */, AD0E119B1ECA215600CDA6BB /* node_scroll.cpp in Sources */, @@ -1392,18 +1291,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; @@ -1416,7 +1324,7 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = engine/pch.h; + GCC_PREFIX_HEADER = src/pch.h; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -1448,18 +1356,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; @@ -1470,7 +1387,7 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = engine/pch.h; + GCC_PREFIX_HEADER = src/pch.h; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1493,30 +1410,6 @@ }; name = Release; }; - AD58E0571E107411006ACC15 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "Mac Developer"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = A6Y3VHN7V9; - MACH_O_TYPE = mh_execute; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - }; - name = Debug; - }; - AD58E0581E107411006ACC15 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "Mac Developer"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = A6Y3VHN7V9; - MACH_O_TYPE = mh_execute; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - }; - name = Release; - }; AD787AEC20D4611100C4712A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1777,7 +1670,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - AD58E04A1E107411006ACC15 /* Build configuration list for PBXProject "engine" */ = { + AD58E04A1E107411006ACC15 /* Build configuration list for PBXProject "PanoPainter" */ = { isa = XCConfigurationList; buildConfigurations = ( AD58E0541E107411006ACC15 /* Debug */, @@ -1786,15 +1679,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - AD58E0561E107411006ACC15 /* Build configuration list for PBXNativeTarget "engine" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - AD58E0571E107411006ACC15 /* Debug */, - AD58E0581E107411006ACC15 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; AD787AEB20D4611100C4712A /* Build configuration list for PBXNativeTarget "PanoQL" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/engine.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/PanoPainter.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 57% rename from engine.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to PanoPainter.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 2c9d68e..74e0a51 100644 --- a/engine.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/PanoPainter.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:/Users/omimac/Desktop/PanoPainter/PanoPainter.xcodeproj"> diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 39e2feb..e7024bd 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -32,65 +32,67 @@ add_library( ../libs/poly2tri/poly2tri/sweep/sweep_context.cc ../libs/poly2tri/poly2tri/sweep/sweep.cc src/main/cpp/main.cpp - ../src\/pch.cpp - ../src\/util.cpp - ../src\/rtt.cpp - ../src\/bezier.cpp - ../src\/asset.cpp - ../src\/image.cpp - ../src\/texture.cpp - ../src\/font.cpp - ../src\/shader.cpp - ../src\/shape.cpp - ../src\/app.cpp - ../src\/app_cloud.cpp - ../src\/app_dialogs.cpp - ../src\/app_events.cpp - ../src\/app_layout.cpp - ../src\/app_shaders.cpp - ../src\/brush.cpp - ../src\/canvas.cpp - ../src\/canvas_modes.cpp - ../src\/log.cpp - ../src\/action.cpp - ../src\/layout.cpp - ../src\/node.cpp - ../src\/node_border.cpp - ../src\/node_button.cpp - ../src\/node_button_custom.cpp - ../src\/node_canvas.cpp - ../src\/node_checkbox.cpp - ../src\/node_color_quad.cpp - ../src\/node_colorwheel.cpp - ../src\/node_combobox.cpp - ../src\/node_dialog_browse.cpp - ../src\/node_dialog_cloud.cpp - ../src\/node_dialog_open.cpp - ../src\/node_dialog_picker.cpp - ../src\/node_dialog_layer_rename.cpp - ../src\/node_icon.cpp - ../src\/node_image.cpp - ../src\/node_image_texture.cpp - ../src\/node_message_box.cpp - ../src\/node_panel_brush.cpp - ../src\/node_panel_color.cpp - ../src\/node_panel_layer.cpp - ../src\/node_panel_stroke.cpp - ../src\/node_popup_menu.cpp - ../src\/node_progress_bar.cpp - ../src\/node_settings.cpp - ../src\/node_slider.cpp - ../src\/node_stroke_preview.cpp - ../src\/node_text.cpp - ../src\/node_text_input.cpp - ../src\/node_viewport.cpp - ../src\/node_scroll.cpp + ../src/pch.cpp + ../src/util.cpp + ../src/rtt.cpp + ../src/bezier.cpp + ../src/asset.cpp + ../src/image.cpp + ../src/texture.cpp + ../src/font.cpp + ../src/shader.cpp + ../src/shape.cpp + ../src/app.cpp + ../src/app_cloud.cpp + ../src/app_dialogs.cpp + ../src/app_events.cpp + ../src/app_layout.cpp + ../src/app_shaders.cpp + ../src/brush.cpp + ../src/canvas.cpp + ../src/canvas_modes.cpp + ../src/log.cpp + ../src/action.cpp + ../src/layout.cpp + ../src/version.cpp + ../src/node.cpp + ../src/node_border.cpp + ../src/node_button.cpp + ../src/node_button_custom.cpp + ../src/node_canvas.cpp + ../src/node_checkbox.cpp + ../src/node_color_quad.cpp + ../src/node_colorwheel.cpp + ../src/node_combobox.cpp + ../src/node_dialog_browse.cpp + ../src/node_dialog_cloud.cpp + ../src/node_dialog_open.cpp + ../src/node_dialog_picker.cpp + ../src/node_dialog_layer_rename.cpp + ../src/node_icon.cpp + ../src/node_image.cpp + ../src/node_image_texture.cpp + ../src/node_message_box.cpp + ../src/node_panel_brush.cpp + ../src/node_panel_color.cpp + ../src/node_panel_grid.cpp + ../src/node_panel_layer.cpp + ../src/node_panel_stroke.cpp + ../src/node_popup_menu.cpp + ../src/node_progress_bar.cpp + ../src/node_settings.cpp + ../src/node_slider.cpp + ../src/node_stroke_preview.cpp + ../src/node_text.cpp + ../src/node_text_input.cpp + ../src/node_viewport.cpp + ../src/node_scroll.cpp ) target_include_directories(native-lib PRIVATE ${ANDROID_NDK}/sources/android/native_app_glue src/main/cpp - ../src\ + ../src ../libs/glm ../libs/tinyxml2 ../libs/yoga diff --git a/android/build.gradle b/android/build.gradle index bb8220b..8a5144b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -74,3 +74,9 @@ task copyFiles(type: Copy) { into 'src/main/assets/data' } preBuild.dependsOn(copyFiles) + +task generateVersioning(type: Exec) { + workingDir "$projectDir/../" + commandLine 'python', 'scripts/pre-build.py', 'release' +} +copyFiles.dependsOn(generateVersioning) diff --git a/engine.xcodeproj/xcuserdata/omimac.xcuserdatad/xcschemes/engine.xcscheme b/engine.xcodeproj/xcuserdata/omimac.xcuserdatad/xcschemes/engine.xcscheme deleted file mode 100644 index 48a3201..0000000 --- a/engine.xcodeproj/xcuserdata/omimac.xcuserdatad/xcschemes/engine.xcscheme +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/engine.xcodeproj/xcuserdata/omimac.xcuserdatad/xcschemes/xcschememanagement.plist b/engine.xcodeproj/xcuserdata/omimac.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index e9bbf07..0000000 --- a/engine.xcodeproj/xcuserdata/omimac.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,52 +0,0 @@ - - - - - SchemeUserState - - PanoPainter-OSX.xcscheme - - orderHint - 2 - - PanoPainter.xcscheme - - orderHint - 1 - - PanoQL.xcscheme - - orderHint - 3 - - PanoThumb.xcscheme - - orderHint - 4 - - engine.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - AD0E5C9B1ECC6F2B00C35669 - - primary - - - AD58E04E1E107411006ACC15 - - primary - - - ADD7D26A1EBF9AE300D5A897 - - primary - - - - - diff --git a/scripts/pre-build.py b/scripts/pre-build.py index c6af7ad..da0a174 100644 --- a/scripts/pre-build.py +++ b/scripts/pre-build.py @@ -6,9 +6,9 @@ import re, subprocess, sys branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).rstrip().decode("utf-8") shorthash = check_output(["git", "log", "--pretty=format:%h", "-n 1"]).rstrip().decode("utf-8") -revcount = len(check_output(["git", "log", "--oneline"]).split(b'\n')) - 1 +revcount = int(check_output(["git", "rev-list", "--count", "HEAD"])) tag = check_output(["git", "describe", "--tags", "--abbrev=0"]).rstrip().decode("utf-8") -config = sys.argv[1] +config = sys.argv[1].lower() version = "%s.%d (%s-%s-%s)" % (tag, revcount, shorthash, branch, config) version_number = "%s.%d" % (tag, revcount) diff --git a/src/version.cpp b/src/version.cpp index b49c6da..acbc1b0 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -1,11 +1,13 @@ #include "version.h" #include "version.gen.h" -#include "windows.h" const char* g_version = PP_VERSION_STRING; const char* g_version_number = PP_VERSION_NUMBER_STRING; const char* g_window_title = "PanoPainter " PP_VERSION_NUMBER_STRING; +#ifdef _WIN32 +#include "windows.h" const wchar_t* g_version_w = TEXT(PP_VERSION_STRING); const wchar_t* g_version_number_w = TEXT(PP_VERSION_NUMBER_STRING); const wchar_t* g_window_title_w = L"PanoPainter " TEXT(PP_VERSION_NUMBER_STRING); +#endif diff --git a/src/version.h b/src/version.h index 6f70250..70fd567 100644 --- a/src/version.h +++ b/src/version.h @@ -4,6 +4,8 @@ extern const char* g_version; extern const char* g_version_number; extern const char* g_window_title; +#ifdef _WIN32 extern const wchar_t* g_version_w; extern const wchar_t* g_version_number_w; extern const wchar_t* g_window_title_w; +#endif