diff options
| author | Jedidiah Barber <contact@jedbarber.id.au> | 2024-02-26 17:14:08 +1300 |
|---|---|---|
| committer | Jedidiah Barber <contact@jedbarber.id.au> | 2024-02-26 17:14:08 +1300 |
| commit | ca99321b1f7aa54b435c73f1ec14321dbd989f16 (patch) | |
| tree | 5c428548dcbd5c1a7201df8bd75524c78974b8f0 | |
| parent | de0f3b8bbb85d9c5d5a226e761f658ee2e0d697b (diff) | |
Fixed linker errors with OpenGL and Fl_Draw::chord
| -rw-r--r-- | src/c_fl_draw.cpp | 8 | ||||
| -rw-r--r-- | src/c_fl_draw.h | 2 | ||||
| -rw-r--r-- | src/fltk-draw.adb | 27 | ||||
| -rw-r--r-- | src/fltk.ads | 1 |
4 files changed, 22 insertions, 16 deletions
diff --git a/src/c_fl_draw.cpp b/src/c_fl_draw.cpp index 4c63f77..5021cd9 100644 --- a/src/c_fl_draw.cpp +++ b/src/c_fl_draw.cpp @@ -318,9 +318,11 @@ void fl_draw_arc2(int x, int y, int w, int h, double a1, double a2) { fl_arc(x, y, w, h, a1, a2); } -void fl_draw_chord(int x, int y, int w, int h, double a1, double a2) { - fl_chord(x, y, w, h, a1, a2); -} +// function does not yet exist +// void fl_draw_chord(int x, int y, int w, int h, double a1, double a2) { +// function does not yet exist +// fl_chord(x, y, w, h, a1, a2); +// } void fl_draw_circle(double x, double y, double r) { fl_circle(x, y, r); diff --git a/src/c_fl_draw.h b/src/c_fl_draw.h index 74c0d00..851386e 100644 --- a/src/c_fl_draw.h +++ b/src/c_fl_draw.h @@ -96,7 +96,7 @@ extern "C" void fl_draw_begin_polygon(); extern "C" void fl_draw_arc(double x, double y, double r, double start, double end); extern "C" void fl_draw_arc2(int x, int y, int w, int h, double a1, double a2); -extern "C" void fl_draw_chord(int x, int y, int w, int h, double a1, double a2); +// extern "C" void fl_draw_chord(int x, int y, int w, int h, double a1, double a2); extern "C" void fl_draw_circle(double x, double y, double r); extern "C" void fl_draw_curve(double x0, double y0, double x1, double y1, double x2, double y2, double x3, double y3); diff --git a/src/fltk-draw.adb b/src/fltk-draw.adb index 4c17674..df2af30 100644 --- a/src/fltk-draw.adb +++ b/src/fltk-draw.adb @@ -433,11 +433,12 @@ package body FLTK.Draw is pragma Import (C, fl_draw_arc2, "fl_draw_arc2"); pragma Inline (fl_draw_arc2); - procedure fl_draw_chord - (X, Y, W, H : in Interfaces.C.int; - A1, A2 : in Interfaces.C.double); - pragma Import (C, fl_draw_chord, "fl_draw_chord"); - pragma Inline (fl_draw_chord); + -- this function does not yet exist + -- procedure fl_draw_chord + -- (X, Y, W, H : in Interfaces.C.int; + -- A1, A2 : in Interfaces.C.double); + -- pragma Import (C, fl_draw_chord, "fl_draw_chord"); + -- pragma Inline (fl_draw_chord); procedure fl_draw_circle (X, Y, R : in Interfaces.C.double); @@ -1566,13 +1567,15 @@ package body FLTK.Draw is (X, Y, W, H : in Integer; Angle1, Angle2 : in Long_Float) is begin - fl_draw_chord - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.double (Angle1), - Interfaces.C.double (Angle2)); + null; + -- this function does not yet exist + -- fl_draw_chord + -- (Interfaces.C.int (X), + -- Interfaces.C.int (Y), + -- Interfaces.C.int (W), + -- Interfaces.C.int (H), + -- Interfaces.C.double (Angle1), + -- Interfaces.C.double (Angle2)); end Chord; diff --git a/src/fltk.ads b/src/fltk.ads index 61775cb..1bacd6e 100644 --- a/src/fltk.ads +++ b/src/fltk.ads @@ -367,6 +367,7 @@ private pragma Linker_Options ("-lfltk"); pragma Linker_Options ("-lfltk_images"); + pragma Linker_Options ("-lfltk_gl"); |