diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-08-09 14:11:42 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-08-09 14:11:42 +0000 |
| commit | 78d853891c145776e19e412b4956fed87a33bf60 (patch) | |
| tree | 208be0977778d912bb06d6ef99953bca49556989 /FL | |
| parent | e5e7fa9b1ee64a1f6d3688930ce162668093a3c1 (diff) | |
[CMake] Fix Windows dll build with Visual Studio generator.
Now you can set OPTION_BUILD_SHARED_LIBS:BOOL=ON to build FLTK dll's with
Visual Studio. Tested and works (Visual Studio 2010 + 2015).
Note: Linux fixes included, tested and works (Ubuntu).
Todo: dll names and target directories may need some changes.
We really need to get rid of that "_SHARED" suffix in .so names.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11867 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Graphics_Driver.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Image_Surface.H | 8 | ||||
| -rw-r--r-- | FL/win32.H | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H index 2f93ef132..0a7282eee 100644 --- a/FL/Fl_Graphics_Driver.H +++ b/FL/Fl_Graphics_Driver.H @@ -74,10 +74,10 @@ class FL_EXPORT Fl_Graphics_Driver { friend class Fl_Pixmap; friend class Fl_Bitmap; friend class Fl_RGB_Image; - friend int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg); - friend void gl_start(); - friend Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *array); - friend void fl_delete_bitmask(Fl_Bitmask); + friend FL_EXPORT int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg); + friend FL_EXPORT void gl_start(); + friend FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *array); + friend FL_EXPORT void fl_delete_bitmask(Fl_Bitmask); public: // The following functions create the various graphics drivers that are required // for core operations. They must be implemented as members of Fl_Graphics_Driver, diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H index 26da75643..887f86ac8 100644 --- a/FL/Fl_Image_Surface.H +++ b/FL/Fl_Image_Surface.H @@ -64,10 +64,10 @@ \endcode */ class FL_EXPORT Fl_Image_Surface : public Fl_Widget_Surface { - friend Fl_Offscreen fl_create_offscreen(int w, int h); - friend void fl_begin_offscreen(Fl_Offscreen ctx); - friend void fl_end_offscreen(void); - friend void fl_delete_offscreen(Fl_Offscreen ctx); + friend FL_EXPORT Fl_Offscreen fl_create_offscreen(int w, int h); + friend FL_EXPORT void fl_begin_offscreen(Fl_Offscreen ctx); + friend FL_EXPORT void fl_end_offscreen(void); + friend FL_EXPORT void fl_delete_offscreen(Fl_Offscreen ctx); private: class Fl_Image_Surface_Driver *platform_surface; protected: diff --git a/FL/win32.H b/FL/win32.H index 1983cc0cf..3a9b74c32 100644 --- a/FL/win32.H +++ b/FL/win32.H @@ -45,7 +45,7 @@ extern FL_EXPORT UINT fl_wake_msg; extern FL_EXPORT char fl_override_redirect; // hack into Fl_Window::make_xid() extern FL_EXPORT int fl_background_pixel; // hack into Fl_Window::make_xid() extern FL_EXPORT HPALETTE fl_palette; // non-zero only on 8-bit displays! -extern FL_EXPORT void fl_release_dc(HWND w, HDC dc); +extern void fl_release_dc(HWND w, HDC dc); extern FL_EXPORT void fl_save_dc( HWND w, HDC dc); #endif // FL_LIBRARY || FL_INTERNALS |