More watcom fixes (STR #627)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3915 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
parent
7ca20dcd4a
commit
85c0090b7c
50
ANNOUNCEMENT
50
ANNOUNCEMENT
@ -33,6 +33,32 @@ exceptions that allow for static linking.
|
||||
|
||||
Changes since FLTK 1.1.4 include:
|
||||
|
||||
- Documentation updates (STR #568, STR #570)
|
||||
- Shortcuts were incorrectly underlined in multi-line
|
||||
labels (STR #566)
|
||||
- More CMake updates (STR #499)
|
||||
- The Watcom C++ compiler needed a small change (STR
|
||||
#567)
|
||||
- Added DESTDIR support and now remove all man pages for
|
||||
the "uninstall" target (STR #545)
|
||||
- Fix PNG drawing on buggy WIN32 graphics cards (STR
|
||||
#548)
|
||||
- The configure script didn't propagate the CPPFLAGS
|
||||
environment variable (STR #549)
|
||||
- The numpad keys didn't work properly on WIN32 (STR
|
||||
#502)
|
||||
- fl_input() and friends now set the input focus to the
|
||||
text field when the dialog is shown (STR #553)
|
||||
- Fixed background color mixup when drawing Fl_Choice
|
||||
menus (STR #544)
|
||||
- Fixed MingW makefiles (STR #550)
|
||||
- More VC++ project file tweaking (STR #559)
|
||||
- Fl_PNG_Image didn't use the png_set_trns_to_alpha
|
||||
function when available (STR #547)
|
||||
- The FL_UNFOCUS event wasn't always sent when switching
|
||||
tabs (STR #558)
|
||||
|
||||
[1.1.5rc3]
|
||||
- Documentation updates (STR #505, STR #513)
|
||||
- Updated PNG library source to 1.2.7.
|
||||
- Updated ZLIB library source to 1.2.1.
|
||||
@ -326,6 +352,30 @@ exceptions that allow for static linking.
|
||||
|
||||
<UL>
|
||||
|
||||
<li>Documentation updates (<a href='str.php?L568'>STR #568</a>, <a href='str.php?L570'>STR #570</a>)
|
||||
<li>Shortcuts were incorrectly underlined in multi-line
|
||||
labels (<a href='str.php?L566'>STR #566</a>)
|
||||
<li>More CMake updates (<a href='str.php?L499'>STR #499</a>)
|
||||
<li>The Watcom C++ compiler needed a small change (<a href='str.php?L567'>STR #567</a>)
|
||||
<li>Added DESTDIR support and now remove all man pages for
|
||||
the "uninstall" target (<a href='str.php?L545'>STR #545</a>)
|
||||
<li>Fix PNG drawing on buggy WIN32 graphics cards (<a href='str.php?L548'>STR #548</a>)
|
||||
<li>The configure script didn't propagate the CPPFLAGS
|
||||
environment variable (<a href='str.php?L549'>STR #549</a>)
|
||||
<li>The numpad keys didn't work properly on WIN32 (<a href='str.php?L502'>STR #502</a>)
|
||||
<li>fl_input() and friends now set the input focus to the
|
||||
text field when the dialog is shown (<a href='str.php?L553'>STR #553</a>)
|
||||
<li>Fixed background color mixup when drawing Fl_Choice
|
||||
menus (<a href='str.php?L544'>STR #544</a>)
|
||||
<li>Fixed MingW makefiles (<a href='str.php?L550'>STR #550</a>)
|
||||
<li>More VC++ project file tweaking (<a href='str.php?L559'>STR #559</a>)
|
||||
<li>Fl_PNG_Image didn't use the png_set_trns_to_alpha
|
||||
function when available (<a href='str.php?L547'>STR #547</a>)
|
||||
<li>The FL_UNFOCUS event wasn't always sent when switching
|
||||
tabs (<a href='str.php?L558'>STR #558</a>)
|
||||
|
||||
<br /><i>[1.1.5rc3]</i>
|
||||
|
||||
<li>Documentation updates (<a href='http://www.fltk.org/str.php?L505'>STR #505</a>, <a href='http://www.fltk.org/str.php?L513'>STR #513</a>)
|
||||
<li>Updated PNG library source to 1.2.7.
|
||||
<li>Updated ZLIB library source to 1.2.1.
|
||||
|
||||
2
CHANGES
2
CHANGES
@ -20,7 +20,7 @@ CHANGES IN FLTK 1.1.6
|
||||
(STR #585)
|
||||
- Fl_Text_Display didn't support CTRL/CMD-A/C (STR #601)
|
||||
- Watcom fixes (STR #581, STR #584, STR #594, STR #595,
|
||||
STR #623)
|
||||
STR #623, STR #627)
|
||||
- Fixed library include order when building DSOs on
|
||||
MacOS X (STR #596)
|
||||
- fl_xid() could cause a WIN32 application to crash (STR
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makefile.wat,v 1.1.2.2 2004/11/21 14:32:21 easysw Exp $"
|
||||
# "$Id: makefile.wat,v 1.1.2.3 2004/11/23 18:48:09 easysw Exp $"
|
||||
#
|
||||
# FLUID makefile for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
@ -45,8 +45,6 @@ OBJECTS = &
|
||||
|
||||
################################################################
|
||||
|
||||
EXTRA_LIBS = wsock32
|
||||
|
||||
!include ../watcom.mif
|
||||
|
||||
all: $(ODIR)/fluid$(EXEEXT)
|
||||
@ -74,5 +72,5 @@ rebuild:
|
||||
./fluid -c widget_panel.fl
|
||||
|
||||
#
|
||||
# End of "$Id: makefile.wat,v 1.1.2.2 2004/11/21 14:32:21 easysw Exp $".
|
||||
# End of "$Id: makefile.wat,v 1.1.2.3 2004/11/23 18:48:09 easysw Exp $".
|
||||
#
|
||||
|
||||
13
watcom.mif
13
watcom.mif
@ -133,6 +133,7 @@ LIBS = $(LIBNAME) $(LIBNAMEFL) $(LIBNAMEGL) $(LIBNAMEIMG)
|
||||
!ifeqi TARGET nt # WINDOWS 32 bit
|
||||
SYSDEF= -DWIN32
|
||||
ASYSDEF=
|
||||
SYSLIBS=wsock32.lib mpr.lib glu32.lib opengl32.lib
|
||||
EXEEXT=.exe
|
||||
|
||||
!else ifeqi TARGET linux # Linux Intel 32 bit generic
|
||||
@ -171,14 +172,14 @@ EXEEXT=.exe
|
||||
! message
|
||||
%abort
|
||||
!endif
|
||||
@if not exist $(ODIR) -mkdir $(ODIR)
|
||||
!ifeqi O d
|
||||
@if not exist $(ODIR) mkdir $(ODIR) >nul
|
||||
!ifeqi TARGET dos
|
||||
@set INCLUDE=$(%WATCOM)\H;$(EXTRA_INCLUDE_DIRS)
|
||||
!else ifeqi O o
|
||||
!else ifeqi TARGET os2
|
||||
@set INCLUDE=$(%WATCOM)\H;$(%WATCOM)\H\OS2;$(EXTRA_INCLUDE_DIRS)
|
||||
!else ifeqi O w
|
||||
!else ifeqi TARGET nt
|
||||
@set INCLUDE=$(%WATCOM)\H;$(%WATCOM)\H\NT;$(EXTRA_INCLUDE_DIRS)
|
||||
!else ifeqi O l
|
||||
!else ifeqi TARGET linux
|
||||
@set INCLUDE=$(%WATCOM)\LH;$(EXTRA_INCLUDE_DIRS)
|
||||
!endif
|
||||
|
||||
@ -276,5 +277,3 @@ LIB=wlib # Watcom librarian
|
||||
@for %i in ($(SYSLIBS)) do @%append $^*.lk1 L %i
|
||||
$(LN) $(LNOPTS) name $^@ op map=$^* @$^*.lk1
|
||||
@del $^*.lk1
|
||||
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* "$Id: config.h,v 1.1.2.1 2004/11/20 03:19:59 easysw Exp $"
|
||||
* "$Id: config.h,v 1.1.2.2 2004/11/23 18:48:10 easysw Exp $"
|
||||
*
|
||||
* Configuration file for the Fast Light Tool Kit (FLTK) for Watcom C++ 1.3
|
||||
*
|
||||
@ -218,5 +218,5 @@
|
||||
|
||||
|
||||
/*
|
||||
* End of "$Id: config.h,v 1.1.2.1 2004/11/20 03:19:59 easysw Exp $".
|
||||
* End of "$Id: config.h,v 1.1.2.2 2004/11/23 18:48:10 easysw Exp $".
|
||||
*/
|
||||
|
||||
@ -4,23 +4,43 @@ Using Watcom to build and use FLTK 1.1.5
|
||||
Supported targets: Win32 only, static builds (no DLLs). Can be used from any Watcom
|
||||
supported host (DOS, OS/2, Windows).
|
||||
|
||||
1. Unzip the include file in the root of the fltk 1.1.5 directory. It will create a
|
||||
new directory called watcom, put a makefile.wat in source directories, and update
|
||||
two sources files which need to be different from the 1.1.5 versions (STR updated),
|
||||
and put a watcom.mif file in the fltk root directory.
|
||||
1. To build fltk itself:
|
||||
- set the environment variable fltk to the root directory of fltk
|
||||
- go to the Watcom directory, run wmake.
|
||||
Both debug and release versions of all libs, test programs and FLUID will be built.
|
||||
|
||||
2. To create you own programs using fluid:
|
||||
- set the environment variable fltk to the root directory of fltk
|
||||
- make a directory where you want to create the source of your program.
|
||||
- from fltk's watcom directory, copy file "makefile.example" to "makefile" in your
|
||||
directory.
|
||||
- Start fluid, and create your program.
|
||||
- You can either put in fluid's menu shell->execute command:
|
||||
"cmd /k "wmake && hello && exit || pause && exit"
|
||||
to compile and run the program (if you are running under Windows only),
|
||||
- Or in Fluid do shift-Ctrl-C to create C+= code, and then in a cmd prompt
|
||||
in your directory enter 'wmake", and then run the program.
|
||||
I have been able to do most of the Fluid Flash tutorial (no time to do all,
|
||||
but no error at all for the ones I did do.
|
||||
|
||||
3. Known errors:
|
||||
- Fluid aborts when exiting.
|
||||
|
||||
Probably a lot more :-( . I cannot test/debug under NT or later, so I must
|
||||
rely on the help of others to find and fix :-) Watcom-related bugs.
|
||||
|
||||
|
||||
Questions about the OpenWatcom port please to the fltk.general newsgroup.
|
||||
Questions related to Openwatcom itself please to the c/c++ users group at
|
||||
new.openwatcom.org.
|
||||
|
||||
|
||||
Mat Nieuwenhoven, Hilversum, 2004-11-22
|
||||
|
||||
|
||||
|
||||
|
||||
2. To build: set the environment variable fltk to the root directory of fltk, go
|
||||
to the Watcom directory, run wmake. Both debug and release versions of all libs,
|
||||
test programs and FLUID will be built.
|
||||
|
||||
3. To create you own programs: use the supplied watcom.mif file. If you use fluid,
|
||||
move the two fluid rules from test/makefile.wat into the watcom.mif
|
||||
file. Look in test/makefile.wat also for rules about building a non-fluid program
|
||||
with one object (source) file, or with multiple. if you use FLUID, take care in
|
||||
the order of object files specified (see tes/makefile.wat keyboard.exe).
|
||||
|
||||
Questions about the watcom port please to the fltk.general newsgroup.
|
||||
|
||||
Mat Nieuwenhoven, Hilversum, 2004-10-28
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user