anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compile fix for mingw

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19713 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2007-08-22 04:52:40 +00:00
parent 9d711c62fc
commit 468d29423e
3 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/lyxinclude.m4
View File

@ -580,6 +580,7 @@ AC_ARG_WITH(packaging,
esac])
AC_MSG_RESULT($lyx_use_packaging)
lyx_install_macosx=false
lyx_install_windows=false
case $lyx_use_packaging in
macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
PACKAGE=LyX${version_suffix}
@ -597,7 +598,8 @@ case $lyx_use_packaging in
libdir='${prefix}/Resources'
datadir='${prefix}/Resources'
pkgdatadir='${datadir}'
mandir='${prefix}/Resources/man' ;;
mandir='${prefix}/Resources/man'
lyx_install_windows=true ;;
posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
PACKAGE=lyx${version_suffix}
program_suffix=$version_suffix
@ -606,6 +608,7 @@ case $lyx_use_packaging in
*) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
esac
AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows)
AC_SUBST(pkgdatadir)
AC_SUBST(program_suffix)
])

10
src/support/Makefile.am
View File

@ -101,11 +101,11 @@ liblyxsupport_la_SOURCES = \
minizip/zip.c \
minizip/zip.h
# FIXME: the following two files are for windows only. I do not know
# how to add them conditionally. autotools are rarely used under windows
# anyway.
# minizip/iowin32.c
# minizip/iowin32.h
if INSTALL_WINDOWS
liblyxsupport_la_SOURCES += \
minizip/iowin32.c \
minizip/iowin32.h
endif
Package.cpp: build_package

49
src/support/minizip/iowin32.c
View File

@ -62,10 +62,9 @@ typedef struct
int error;
} WIN32FILE_IOWIN;
voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode)
voidpf opaque;
const char* filename;
int mode;
voidpf ZCALLBACK win32_open_file_func(voidpf opaque,
const char * filename,
int mode)
{
//const char* mode_fopen = NULL;
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
@ -114,11 +113,10 @@ voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode)
}
uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
voidpf opaque;
voidpf stream;
void* buf;
uLong size;
uLong ZCALLBACK win32_read_file_func(voidpf opaque,
voidpf stream,
void * buf,
uLong size)
{
uLong ret=0;
HANDLE hFile = NULL;
@ -137,11 +135,10 @@ uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
}
uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size)
voidpf opaque;
voidpf stream;
const void* buf;
uLong size;
uLong ZCALLBACK win32_write_file_func(voidpf opaque,
voidpf stream,
const void * buf,
uLong size)
{
uLong ret=0;
HANDLE hFile = NULL;
@ -160,9 +157,7 @@ uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size)
return ret;
}
long ZCALLBACK win32_tell_file_func (opaque, stream)
voidpf opaque;
voidpf stream;
long ZCALLBACK win32_tell_file_func(voidpf opaque, voidpf stream)
{
long ret=-1;
HANDLE hFile = NULL;
@ -183,11 +178,10 @@ long ZCALLBACK win32_tell_file_func (opaque, stream)
return ret;
}
long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
voidpf opaque;
voidpf stream;
uLong offset;
int origin;
long ZCALLBACK win32_seek_file_func(voidpf opaque,
voidpf stream,
uLong offset,
int origin)
{
DWORD dwMoveMethod=0xFFFFFFFF;
HANDLE hFile = NULL;
@ -224,9 +218,7 @@ long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
return ret;
}
int ZCALLBACK win32_close_file_func (opaque, stream)
voidpf opaque;
voidpf stream;
int ZCALLBACK win32_close_file_func(voidpf opaque, voidpf stream)
{
int ret=-1;
@ -244,9 +236,7 @@ int ZCALLBACK win32_close_file_func (opaque, stream)
return ret;
}
int ZCALLBACK win32_error_file_func (opaque, stream)
voidpf opaque;
voidpf stream;
int ZCALLBACK win32_error_file_func(voidpf opaque, voidpf stream)
{
int ret=-1;
if (stream!=NULL)
@ -256,8 +246,7 @@ int ZCALLBACK win32_error_file_func (opaque, stream)
return ret;
}
void fill_win32_filefunc (pzlib_filefunc_def)
zlib_filefunc_def* pzlib_filefunc_def;
void fill_win32_filefunc(zlib_filefunc_def * pzlib_filefunc_def)
{
pzlib_filefunc_def->zopen_file = win32_open_file_func;
pzlib_filefunc_def->zread_file = win32_read_file_func;