Update to v096r01 release.

byuu says:

Changelog:

- restructured the project and removed a whole bunch of old/dead
  directives from higan/GNUmakefile
- huge amounts of work on hiro/cocoa (compiles but ~70% of the
  functionality is commented out)
- fixed a masking error in my ARM CPU disassembler [Lioncash]
- SFC: decided to change board cic=(411,413) back to board
  region=(ntsc,pal) ... the former was too obtuse

If you rename Boolean (it's a problem with an include from ruby, not
from hiro) and disable all the ruby drivers, you can compile an
OS X binary, but obviously it's not going to do anything.

It's a boring WIP, I just wanted to push out the project structure
change now at the start of this WIP cycle.
This commit is contained in:
Tim Allen
2015-12-30 17:41:46 +11:00
parent 27660505c8
commit 47d4bd4d81
707 changed files with 3789 additions and 3373 deletions

View File

@@ -1,8 +1,10 @@
#if defined(Hiro_Canvas)
@interface CocoaCanvas : NSImageView {
@public
phoenix::Canvas* canvas;
hiro::mCanvas* canvas;
}
-(id) initWith:(phoenix::Canvas&)canvas;
-(id) initWith:(hiro::mCanvas&)canvas;
-(NSDragOperation) draggingEntered:(id<NSDraggingInfo>)sender;
-(BOOL) performDragOperation:(id<NSDraggingInfo>)sender;
-(void) mouseButton:(NSEvent*)event down:(BOOL)isDown;
@@ -19,24 +21,27 @@
-(void) otherMouseDragged:(NSEvent*)event;
@end
namespace phoenix {
namespace hiro {
struct pCanvas : pWidget {
Declare(Canvas, Widget)
auto minimumSize() const -> Size;
auto setColor(Color color) -> void;
auto setDroppable(bool droppable) -> void;
auto setGeometry(Geometry geometry) -> void override;
auto setGradient(Gradient gradient) -> void;
auto setImage(const Image& image) -> void;
auto update() -> void;
auto _rasterize() -> void;
auto _redraw() -> void;
struct pCanvas : public pWidget {
Canvas& canvas;
CocoaCanvas* cocoaCanvas = nullptr;
unsigned surfaceWidth = 0;
unsigned surfaceHeight = 0;
void setDroppable(bool droppable);
void setGeometry(Geometry geometry);
void setMode(Canvas::Mode mode);
void setSize(Size size);
pCanvas(Canvas& canvas) : pWidget(canvas), canvas(canvas) {}
void constructor();
void destructor();
void rasterize();
void redraw();
uint surfaceWidth = 0;
uint surfaceHeight = 0;
};
}
#endif