Commit Graph

46 Commits

Author SHA1 Message Date
Matthias Melcher
a679616477 Add header files to CMake setup.
I added a regex search to add header files. This is helpful when searching for symbols and strings from within the Xcode IDE and likely others as well.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11145 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-10 12:03:16 +00:00
Matthias Melcher
41e22f2f39 Move ifdef's in RGB_Image into driver system.
- change image caching variable types to uintptr_t
- added driver function to uncache image data
- cleaning up (Xlib and GDI will likely throw syntax errors. Trying to fix ASAP)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11138 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-09 18:25:02 +00:00
Matthias Melcher
dee0f5a824 Strip Graphics Driver related ifdefs.
- removed more ifdef's from the graphics drivers
- moved functionality into the driver files themselves
- updated CMakeList.txt



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11137 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-09 12:33:49 +00:00
Manolo Gouy
a8a777ff26 New CMake option OPTION_PRINT_SUPPORT turned ON by default
When the option is off, file config.h defines NO_PRINT_SUPPORT 
which in turn produces a library without print support, that is, 
class Fl_Printer does nothing.
When off, the FLTK library is somewhat smaller.
Can be turned off only when the X11 library is used.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11127 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-05 16:34:42 +00:00
Albrecht Schlosser
642187dc1c Finish removing of #include of driver files, remove FL_LIBRARY_CMAKE.
Now all graphics drivers are compiled as individual files depending
on the platform and configuration. The preprocessor macro FL_LIBRARY_CMAKE
is now obsolete and has been removed.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11093 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 01:14:50 +00:00
Albrecht Schlosser
5c32d3b24c Update build system to compile all drivers as indiviual objects.
Removed obsolete files that served only one purpose: to #include
different driver files. Updated CMake and Makefiles to reflect the
changes. Build tested with:
 - MinGW + configure/make
 - MinGW + CMake/make
 - Visual Studio 2010 generated by CMake


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11092 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 00:39:57 +00:00
Matthias Melcher
222243bc86 Made OpenGL driver compile by itself instead of including files from another .cxx file.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11083 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29 15:24:33 +00:00
Albrecht Schlosser
74aa645d8f Fix silly copy-and-change error.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11072 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 00:48:42 +00:00
Albrecht Schlosser
6d72d430e4 (Try to) fix CMake for Apple, prepare for Windows drivers.
This update is tested on Linux only, but should hopefully work on
Mac OS X with CMake + make and/or CMake + Xcode.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11071 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 00:31:59 +00:00
Albrecht Schlosser
48db7a07ef Modify Xlib driver code not to #include source files.
Adjusted CMake build, and with some additional temporary #ifdef's
the old Linux Makefile system works as well.

Defined FL_LIBRARY_CMAKE for now - will be removed later.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11067 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-27 23:57:53 +00:00
Manolo Gouy
69ec698e41 Mac OS: modified CMake config files to allow use of OPTION_APPLE_X11
to build an X11-using version of FLTK on the Mac OS platform.
This matches the recent support of the --enable-x11 option
by the configure script on the mac.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10986 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-31 06:19:59 +00:00
Albrecht Schlosser
9fe9fbe3bc [CMake] Fix missing link libraries for shared FLTK lib (STR #3251).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10832 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-08-16 14:13:21 +00:00
Albrecht Schlosser
d2663161e2 [CMake] Improve handling of ldl and X11 libraries (STR #3196).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10590 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-02-24 14:50:37 +00:00
Albrecht Schlosser
3e1da3012a Remove Fl::*sleep() method family, as discussed in fltk.coredev.
Hopefully this doesn't break Windows or Mac OX IDE builds, please help
testing.

Short story: these functions showed compatibility problems, lacked some
quality (regarding interruption by signals), and maybe more.

This is a combined commit that reverts three (3) svn commits. The following
lists are extracted from git, but show the svn revisions and files:

    Remove Fl::*sleep() family, part 1: revert svn r 10287.

:100644 100644 a988702... 794920f... M	ide/Xcode4/FLTK.xcodeproj/project.pbxproj

    Remove Fl::*sleep() family, part 2: revert svn r 10151.

:100644 100644 cf839e6... bfde9c4... M	ide/Xcode3/FLTK.xcodeproj/project.pbxproj
:100644 100644 794920f... c0c772a... M	ide/Xcode4/FLTK.xcodeproj/project.pbxproj

    Remove Fl::*sleep() family, part 2b: revert svn r 10151 (continued).

:100644 100644 bfde9c4... abf2922... M	ide/Xcode3/FLTK.xcodeproj/project.pbxproj

    Remove Fl::*sleep() family, part 3: revert svn r 10150.

:100644 100644 b469018... e76a3e5... M	FL/Fl.H
:100644 100644 7bb7899... 4d4755d... M	ide/VisualC2008/fltk.lib.vcproj
:100644 100644 9d9a2cf... 334aef8... M	ide/VisualC2008/fltkdll.vcproj
:100644 100644 5533a54... e30058b... M	ide/VisualC2010/fltk.lib.vcxproj
:100644 100644 e49f691... 1259c87... M	ide/VisualC2010/fltk.lib.vcxproj.filters
:100644 100644 946f31a... d53ab80... M	src/CMakeLists.txt
:100644 000000 fed36fd... 0000000... D	src/Fl_sleep.cxx
:100644 100644 3d9656c... 3b265f9... M	src/Makefile
:100644 100644 6eadbcb... 5dd5872... M	test/sudoku.cxx


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10419 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-30 16:05:22 +00:00
Albrecht Schlosser
318c3619dc CMake enhancements, as discussed in STR #3055.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-27 00:41:06 +00:00
Manolo Gouy
f1b2c92fce STR#3093 continued: deleted the Fl_Shaped_Window class. Instead, added new member function Fl_Window::shape(Fl_Image*)
that gives a non-rectangular shape to a standard window. The benefit is that it works with Fl_Double_Window and Fl_Menu_Window as well.
It also works for free with Fl_Gl_Window on the X11 platform only.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-21 14:10:36 +00:00
Manolo Gouy
11f55e80b3 Put Fl_PostScript.cxx in list of files compiled in libfltk rather than including it in Fl_Printer.cxx.
VisualC project files still need to be changed accordingly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10291 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-08 16:03:52 +00:00
Manolo Gouy
8997131377 Added the Fl_Shaped_Window class to support windows of arbitrary shapes.
The new class is fully Doxygen-documented.
Added an example program (example/shapedwindow.cxx) that exercises the new class.
Modified all IDE-supporting files accordingly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10255 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-08-27 11:55:57 +00:00
Pierre Ossman
936e4ca511 Only link with fontconfig if Xft is used
This matches what the autoconf stuff does. It is also crucial
on OS X where linking against fontconfig can fool the system into
believing that FLTK requires X11, prompting the installation of
XQuartz.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10244 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-08-22 11:54:35 +00:00
Pierre Ossman
332dc1b7ac Add method to set any custom cursor, based on a Fl_RGB_Image object.
Also change our fallback cursors to use this method, so that fallback
cursors are handled in a platform independent manner. STR #2660.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10196 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-06-16 11:17:57 +00:00
Manolo Gouy
9648a51d67 Added new source files Fl_Copy_Surface.cxx & Fl_Image_Surface.cxx
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10166 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-24 06:17:12 +00:00
Fabien Costantini
54b0123eab Added a new portable sleep API(ABI compatible). Now features a flexible multi-usage sleep() api accepting decimals, msleep() for millisecs only, usleep() for microsecs. Updated Makefiles, cmakefiles, vs2008, vs2010 with the new Fl_sleep add-on. Documented new API. still needs to be added in Xcode.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10150 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-21 04:10:12 +00:00
Greg Ercolano
cc4697dbf2 Fixes STR#3065
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10135 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-04-29 03:22:38 +00:00
Albrecht Schlosser
738563f973 Fixed missing libdl dependency in CMake builds (STR #2977).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10042 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-01-03 16:42:21 +00:00
Pierre Ossman
1d6cc80d59 STR 2636. Add ability to get notifications whenever the
clipboard changes.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9974 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-09-11 12:54:40 +00:00
Greg Ercolano
d31afde9d8 Fixes STR #2962: Applied patch from ossman
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9920 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-05-16 13:48:22 +00:00
Manolo Gouy
5c513270f9 Renamed src/Fl_Sys_Menu_Bar.cxx to src/Fl_Sys_Menu_Bar.mm because objective-c code is used (cont'd).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9886 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-04-16 14:11:21 +00:00
Manolo Gouy
77204efa1c X11 specific: made class Fl_X visible only if FL_LIBRARY is defined before compilation,
as discussed in fltk.development ("Fl_X not exported on mac in 1.3").  
Tested OK with configure+make and CMake.
At this point, the FL_X class remains to be hidden on the WIN32 platform.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8268 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-12 09:24:03 +00:00
Manolo Gouy
bc509d32eb Fix STR #2504 (first part). Replaced HAVE _CAIRO by FLTK_HAVE_CAIRO and USE_CAIRO
by FLTK_USE_CAIRO everywhere.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8198 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-01-06 10:24:58 +00:00
Manolo Gouy
a8530c73fa Adopted use of FL_LIBRARY #define symbol under Mac OS X. This allows to compile
client applications without including Mac OS system headers, with a gain in speed of 
compilation and portability. The source files of all FLTK libraries must now be compiled with 
-DFL_LIBRARY under Mac OS X. Make, CMake and Xcode project support files
have been modified accordingly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-23 14:24:29 +00:00
Manolo Gouy
f3c7efc8d2 The 3 objective-c++ files used for the Mac OS X support are no longer included
by other files but added to the list of source files to be compiled
for Mac OS X only. Support files for autoconf/configure/make, CMake and Xcode
are also modified accordingly.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8049 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-12-17 10:43:41 +00:00
Matthias Melcher
e36e07f313 Changed USE_XINERAMA into HAVE_XINERAME in CMake files. STR #2422
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7899 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-27 21:46:59 +00:00
Albrecht Schlosser
6bd9230bcf Updated CMake files and removed now obsolete test/tree.cxx and
test/tree.h files.
Note: CMake not yet tested with these modifications.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7675 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-07-10 14:25:46 +00:00
Albrecht Schlosser
e61436c596 Fixed typo in src/CMakeLists.txt and added missing objective-c++ files
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7593 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-05-06 07:13:33 +00:00
Albrecht Schlosser
a0d26b634a Mostly rewritten CMake files by Michael Surette. They are more complete
than what we had previously, but may need some more testing. The latest
changes (removing old APPLE_QD definitions and code) might need another
update.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7451 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-04-05 22:33:58 +00:00
Albrecht Schlosser
ec908230a1 Added Fl_Table, Fl_Tree, and Fl_Native_File_Chooser CMake build files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7010 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-01-15 16:02:00 +00:00
Albrecht Schlosser
1b2df88ed0 More CMake updates (STR #2244):
- added missing files in src/CMakeLists.txt
 - added -DUSE_X11 for Unix builds
 - added new test/unittests program

Thanks to Yassine (yostane) for testing and helping to update the CMake files.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6847 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-08-30 21:15:43 +00:00
Greg Ercolano
af570d2be4 Solves STR #2244.
See also, fltk.general newgroup thread:
    Subject: "probelm to build fltk 1.3 svn using msys, gcc3.4 and cmake"
    (Dates 08/28/09 - 08/29/09)

Applied Yostane's zip file mods to the two CMakeLists.txt to support 
msys/gcc3.4/cmake environment. Verified consistency, fixed indents.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6846 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2009-08-30 03:45:52 +00:00
Michael R Sweet
bda374b386 Add GLUT support functions from FreeGLUT (STR #1522)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5650 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2007-02-01 18:10:07 +00:00
Michael R Sweet
5456a2b8fc Add fl_open_uri() function as discussed on fltk.development.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5579 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2007-01-04 14:53:54 +00:00
Matthias Melcher
cc1ab1a315 STR #1447: Fixed CMake files to include new GTK+ scheme
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5490 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2006-09-26 18:05:10 +00:00
Dejan Lekic
1cd06f3ad0 This commit contains patch submitted by "fltk.x0" (thanks fltk.x0!) in the middle of May this year - STR #863. Also small change in fluid.cxx - time.h was needed for successful build on MinGW.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4468 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-08-06 05:02:56 +00:00
Michael R Sweet
5ca7674da3 Updates to cmake project files (STR #813)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4345 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-05-13 03:05:08 +00:00
Michael R Sweet
1f2456132e Cmake updates (STR #645)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4026 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 00:17:50 +00:00
Michael R Sweet
ca005c4067 Documentation updates (STR #568)
More CMake updates (STR #499)

The Watcom C++ compiler needed a small change (STR #567)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3869 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-10-18 20:29:58 +00:00
Michael R Sweet
1ca225e19d Added (unsupported) CMake files (STR #499)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3829 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-09-13 02:12:41 +00:00