mirror of https://github.com/fltk/fltk
The configure script did not support --disable-localfoo to
completely disable image file support (STR #582) The Visual C++ 6.0 project files still listed the old JPEG, PNG, and ZLIB library names (STR #577) Fixed the scandir() conditional code for HP-UX 11i (STR #585) Fl_Text_Display didn't support CTRL/CMD-A/C (STR #601) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3898 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
parent
23bb059065
commit
fc8d065cd7
10
CHANGES
10
CHANGES
|
|
@ -1,6 +1,14 @@
|
|||
CHANGES IN FLTK 1.1.6
|
||||
|
||||
- Watcom fixes (STR #584, STR #594, STR #595)
|
||||
- The configure script did not support
|
||||
--disable-localfoo to completely disable image file
|
||||
support (STR #582)
|
||||
- The Visual C++ 6.0 project files still listed the old
|
||||
JPEG, PNG, and ZLIB library names (STR #577)
|
||||
- Fixed the scandir() conditional code for HP-UX 11i
|
||||
(STR #585)
|
||||
- Fl_Text_Display didn't support CTRL/CMD-A/C (STR #601)
|
||||
- Watcom fixes (STR #581, STR #584, STR #594, STR #595)
|
||||
- Fixed library include order when building DSOs on
|
||||
MacOS X (STR #596)
|
||||
- fl_xid() could cause a WIN32 application to crash (STR
|
||||
|
|
|
|||
57
configure.in
57
configure.in
|
|
@ -1,7 +1,7 @@
|
|||
dnl -*- sh -*-
|
||||
dnl the "configure" script is made from this by running GNU "autoconf"
|
||||
dnl
|
||||
dnl "$Id: configure.in,v 1.33.2.31.2.121 2004/11/20 03:19:57 easysw Exp $"
|
||||
dnl "$Id: configure.in,v 1.33.2.31.2.122 2004/11/20 03:44:17 easysw Exp $"
|
||||
dnl
|
||||
dnl Configuration script for the Fast Light Tool Kit (FLTK).
|
||||
dnl
|
||||
|
|
@ -377,35 +377,49 @@ IMAGELIBS=""
|
|||
AC_SUBST(IMAGELIBS)
|
||||
|
||||
AC_ARG_ENABLE(localjpeg, [ --enable-localjpeg use local JPEG library, default=auto],
|
||||
[if eval "test x$enable_localjpeg = xyes"; then
|
||||
[if test x$enable_localjpeg = xyes; then
|
||||
ac_cv_lib_jpeg_jpeg_CreateCompress=no
|
||||
fi])
|
||||
|
||||
AC_CHECK_LIB(jpeg,jpeg_CreateCompress,
|
||||
AC_DEFINE(HAVE_LIBJPEG)
|
||||
JPEGINC=""
|
||||
JPEG=""
|
||||
IMAGELIBS="-ljpeg $IMAGELIBS",
|
||||
JPEGINC="-I../jpeg"
|
||||
JPEG="jpeg"
|
||||
IMAGELIBS="-lfltk_jpeg $IMAGELIBS")
|
||||
if test x$enable_localjpeg = xno; then
|
||||
JPEGINC=""
|
||||
JPEG=""
|
||||
else
|
||||
AC_DEFINE(HAVE_LIBJPEG)
|
||||
JPEGINC="-I../jpeg"
|
||||
JPEG="jpeg"
|
||||
IMAGELIBS="-lfltk_jpeg $IMAGELIBS"
|
||||
fi)
|
||||
|
||||
AC_ARG_ENABLE(localzlib, [ --enable-localzlib use local ZLIB library, default=auto],
|
||||
[if eval "test x$enable_localzlib = xyes"; then
|
||||
[if test x$enable_localzlib = xyes; then
|
||||
ac_cv_lib_z_gzgets=no
|
||||
fi])
|
||||
|
||||
AC_CHECK_LIB(z,gzgets,
|
||||
AC_DEFINE(HAVE_LIBZ)
|
||||
ZLIBINC=""
|
||||
ZLIB=""
|
||||
LIBS="-lz $LIBS"
|
||||
IMAGELIBS="-lz $IMAGELIBS",
|
||||
ZLIBINC="-I../zlib"
|
||||
ZLIB="zlib"
|
||||
LIBS="-lfltk_z $LIBS"
|
||||
IMAGELIBS="-lfltk_z $IMAGELIBS")
|
||||
if test x$enable_localzlib = xno; then
|
||||
ZLIBINC=""
|
||||
ZLIB=""
|
||||
else
|
||||
AC_DEFINE(HAVE_LIBZ)
|
||||
ZLIBINC="-I../zlib"
|
||||
ZLIB="zlib"
|
||||
LIBS="-lfltk_z $LIBS"
|
||||
IMAGELIBS="-lfltk_z $IMAGELIBS"
|
||||
fi)
|
||||
|
||||
AC_ARG_ENABLE(localpng, [ --enable-localpng use local PNG library, default=auto],
|
||||
[if eval "test x$enable_localpng = xyes"; then
|
||||
[if test x$enable_localpng = xyes; then
|
||||
ac_cv_lib_png_png_set_tRNS_to_alpha=no
|
||||
fi])
|
||||
|
||||
|
|
@ -413,11 +427,18 @@ AC_CHECK_LIB(png,png_set_tRNS_to_alpha, [
|
|||
PNGINC=""
|
||||
PNG=""
|
||||
IMAGELIBS="-lpng $IMAGELIBS"
|
||||
AC_DEFINE(HAVE_LIBPNG)
|
||||
AC_CHECK_HEADER(png.h, AC_DEFINE(HAVE_PNG_H))],[
|
||||
AC_DEFINE(HAVE_PNG_H)
|
||||
PNGINC="-I../png"
|
||||
PNG="png"
|
||||
IMAGELIBS="-lfltk_png $IMAGELIBS"])
|
||||
if test x$enable_localpng = xno; then
|
||||
PNGINC=""
|
||||
PNG=""
|
||||
else
|
||||
AC_DEFINE(HAVE_LIBPNG)
|
||||
AC_DEFINE(HAVE_PNG_H)
|
||||
PNGINC="-I../png"
|
||||
PNG="png"
|
||||
IMAGELIBS="-lfltk_png $IMAGELIBS"
|
||||
fi])
|
||||
|
||||
AC_SUBST(JPEG)
|
||||
AC_SUBST(JPEGINC)
|
||||
|
|
@ -426,10 +447,6 @@ AC_SUBST(PNGINC)
|
|||
AC_SUBST(ZLIB)
|
||||
AC_SUBST(ZLIBINC)
|
||||
|
||||
AC_DEFINE(HAVE_LIBJPEG)
|
||||
AC_DEFINE(HAVE_LIBPNG)
|
||||
AC_DEFINE(HAVE_LIBZ)
|
||||
|
||||
dnl Restore original LIBS settings...
|
||||
LIBS="$SAVELIBS"
|
||||
|
||||
|
|
@ -911,5 +928,5 @@ dnl Make sure the fltk-config script is executable...
|
|||
chmod +x fltk-config
|
||||
|
||||
dnl
|
||||
dnl End of "$Id: configure.in,v 1.33.2.31.2.121 2004/11/20 03:19:57 easysw Exp $".
|
||||
dnl End of "$Id: configure.in,v 1.33.2.31.2.122 2004/11/20 03:44:17 easysw Exp $".
|
||||
dnl
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// "$Id: Fl_Text_Display.cxx,v 1.12.2.57 2004/09/07 20:59:17 easysw Exp $"
|
||||
// "$Id: Fl_Text_Display.cxx,v 1.12.2.58 2004/11/20 03:44:17 easysw Exp $"
|
||||
//
|
||||
// Copyright 2001-2004 by Bill Spitzak and others.
|
||||
// Original code Copyright Mark Edel. Permission to distribute under
|
||||
|
|
@ -3124,6 +3124,23 @@ int Fl_Text_Display::handle(int event) {
|
|||
if (buffer()->selected()) redraw();
|
||||
|
||||
return 1;
|
||||
|
||||
case FL_KEYBOARD:
|
||||
// Copy?
|
||||
if ((Fl::event_state()&(FL_CTRL|FL_COMMAND)) && Fl::event_key()=='c') {
|
||||
if (!buffer()->selected()) return 1;
|
||||
const char *copy = buffer()->selection_text();
|
||||
if (*copy) Fl::copy(copy, strlen(copy), 1);
|
||||
free((void*)copy);
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Select all ?
|
||||
if ((Fl::event_state()&(FL_CTRL|FL_COMMAND)) && Fl::event_key()=='a') {
|
||||
buffer()->select(0,buffer()->length());
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -3131,5 +3148,5 @@ int Fl_Text_Display::handle(int event) {
|
|||
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.57 2004/09/07 20:59:17 easysw Exp $".
|
||||
// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.58 2004/11/20 03:44:17 easysw Exp $".
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// "$Id: filename_list.cxx,v 1.10.2.11.2.7 2004/04/11 04:38:59 easysw Exp $"
|
||||
// "$Id: filename_list.cxx,v 1.10.2.11.2.8 2004/11/20 03:44:18 easysw Exp $"
|
||||
//
|
||||
// Filename list routines for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
|
|
@ -49,7 +49,9 @@ int fl_casealphasort(struct dirent **a, struct dirent **b) {
|
|||
|
||||
int fl_filename_list(const char *d, dirent ***list,
|
||||
Fl_File_Sort_F *sort) {
|
||||
#if defined(__hpux) || defined(__CYGWIN__)
|
||||
#ifndef HAVE_SCANDIR
|
||||
return scandir(d, list, 0, sort);
|
||||
#elif defined(__hpux) || defined(__CYGWIN__)
|
||||
// HP-UX, Cygwin define the comparison function like this:
|
||||
return scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
|
||||
#elif defined(__osf__)
|
||||
|
|
@ -58,7 +60,7 @@ int fl_filename_list(const char *d, dirent ***list,
|
|||
#elif defined(_AIX)
|
||||
// AIX is almost standard...
|
||||
return scandir(d, list, 0, (int(*)(void*, void*))sort);
|
||||
#elif HAVE_SCANDIR && !defined(__sgi)
|
||||
#elif !defined(__sgi)
|
||||
// The vast majority of UNIX systems want the sort function to have this
|
||||
// prototype, most likely so that it can be passed to qsort without any
|
||||
// changes:
|
||||
|
|
@ -71,5 +73,5 @@ int fl_filename_list(const char *d, dirent ***list,
|
|||
}
|
||||
|
||||
//
|
||||
// End of "$Id: filename_list.cxx,v 1.10.2.11.2.7 2004/04/11 04:38:59 easysw Exp $".
|
||||
// End of "$Id: filename_list.cxx,v 1.10.2.11.2.8 2004/11/20 03:44:18 easysw Exp $".
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// "$Id: threads.h,v 1.1.2.7 2004/04/11 04:39:01 easysw Exp $"
|
||||
// "$Id: threads.h,v 1.1.2.8 2004/11/20 03:44:18 easysw Exp $"
|
||||
//
|
||||
// Simple threading API for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
|
|
@ -53,7 +53,7 @@ static int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p)
|
|||
return pthread_create((pthread_t*)&t, 0, f, p);
|
||||
}
|
||||
|
||||
# elif defined(WIN32) // Use Windows threading...
|
||||
# elif defined(WIN32) && !defined(__WATCOMC__) // Use Windows threading...
|
||||
|
||||
# include <windows.h>
|
||||
# include <process.h>
|
||||
|
|
@ -64,9 +64,17 @@ static int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p) {
|
|||
return t = (Fl_Thread)_beginthread((void( __cdecl * )( void * ))f, 0, p);
|
||||
}
|
||||
|
||||
# elif defined(__WATCOMC__)
|
||||
# include <process.h>
|
||||
|
||||
typedef unsigned long Fl_Thread;
|
||||
|
||||
static int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p) {
|
||||
return t = (Fl_Thread)_beginthread((void(* )( void * ))f, 32000, p);
|
||||
}
|
||||
# endif // !HAVE_PTHREAD_H
|
||||
#endif // !Threads_h
|
||||
|
||||
//
|
||||
// End of "$Id: threads.h,v 1.1.2.7 2004/04/11 04:39:01 easysw Exp $".
|
||||
// End of "$Id: threads.h,v 1.1.2.8 2004/11/20 03:44:18 easysw Exp $".
|
||||
//
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 fltk.lib jpeg.lib png.lib z.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/file_chooser.exe" /libpath:"..\lib"
|
||||
# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/file_chooser.exe" /libpath:"..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:yes
|
||||
|
||||
!ELSEIF "$(CFG)" == "file_chooser - Win32 Debug"
|
||||
|
|
@ -80,7 +80,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 fltkd.lib jpeg.lib png.lib z.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\lib"
|
||||
# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:no
|
||||
|
||||
!ENDIF
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386
|
||||
# ADD LINK32 jpeg.lib png.lib z.lib opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdll.pdb" /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"msvcrt" /out:"fltkdll.dll"
|
||||
# ADD LINK32 opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdll.pdb" /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"msvcrt" /out:"fltkdll.dll"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "fltkdll - Win32 Debug"
|
||||
|
|
@ -80,7 +80,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 jpeg.lib png.lib z.lib opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdlld.pdb" /debug /machine:I386 /nodefaultlib:"libcmtd" /nodefaultlib:"msvcrt" /out:"fltkdlld.dll" /pdbtype:sept
|
||||
# ADD LINK32 opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdlld.pdb" /debug /machine:I386 /nodefaultlib:"libcmtd" /nodefaultlib:"msvcrt" /out:"fltkdlld.dll" /pdbtype:sept
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:no
|
||||
|
||||
!ENDIF
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 fltk.lib jpeg.lib png.lib z.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../fluid/fluid.exe" /libpath:"..\lib"
|
||||
# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../fluid/fluid.exe" /libpath:"..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:yes
|
||||
|
||||
!ELSEIF "$(CFG)" == "fluid - Win32 Debug"
|
||||
|
|
@ -81,7 +81,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 fltkd.lib jpeg.lib png.lib z.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../fluid/fluidd.exe" /pdbtype:sept /libpath:"..\lib"
|
||||
# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../fluid/fluidd.exe" /pdbtype:sept /libpath:"..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:no
|
||||
|
||||
!ENDIF
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 fltk.lib jpeg.lib png.lib z.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/help.exe" /libpath:"..\lib"
|
||||
# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/help.exe" /libpath:"..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:yes
|
||||
|
||||
!ELSEIF "$(CFG)" == "help - Win32 Debug"
|
||||
|
|
@ -80,7 +80,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 fltkd.lib jpeg.lib png.lib z.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/helpd.exe" /pdbtype:sept /libpath:"..\lib"
|
||||
# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/helpd.exe" /pdbtype:sept /libpath:"..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:no
|
||||
|
||||
!ENDIF
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 fltk.lib jpeg.lib png.lib z.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/pixmap_browser.exe" /libpath:"..\lib"
|
||||
# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/pixmap_browser.exe" /libpath:"..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:yes
|
||||
|
||||
!ELSEIF "$(CFG)" == "pixmap_browser - Win32 Debug"
|
||||
|
|
@ -80,7 +80,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 fltkd.lib jpeg.lib png.lib z.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\lib"
|
||||
# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:no
|
||||
|
||||
!ENDIF
|
||||
|
|
|
|||
Loading…
Reference in New Issue