Fix compilation when there is no zlib
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2556
This commit is contained in:
parent
49529ce994
commit
f5e4334ff8
3 changed files with 4 additions and 8 deletions
|
@ -6,8 +6,7 @@ bin_PROGRAMS = dosbox
|
|||
|
||||
dosbox_SOURCES = dosbox.cpp
|
||||
dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a hardware/libhardware.a gui/libgui.a \
|
||||
ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a \
|
||||
libs/zmbv/libzmbv.a
|
||||
ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a
|
||||
|
||||
if HAVE_WINDRES
|
||||
dosbox_LDADD += dosbox_ico.o
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: hardware.cpp,v 1.14 2006-02-14 12:46:43 qbix79 Exp $ */
|
||||
/* $Id: hardware.cpp,v 1.15 2006-03-27 19:18:00 qbix79 Exp $ */
|
||||
|
||||
#include <dirent.h>
|
||||
#include <string.h>
|
||||
|
@ -33,7 +33,7 @@
|
|||
|
||||
#if (C_SSHOT)
|
||||
#include <png.h>
|
||||
#include "../libs/zmbv/zmbv.h"
|
||||
#include "../libs/zmbv/zmbv.cpp"
|
||||
#endif
|
||||
|
||||
static char * capturedir;
|
||||
|
|
|
@ -1,4 +1 @@
|
|||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
|
||||
noinst_LIBRARIES = libzmbv.a
|
||||
libzmbv_a_SOURCES = zmbv.cpp zmbv.h
|
||||
EXTRA_DIST = zmbv.cpp zmbv.h
|
||||
|
|
Loading…
Add table
Reference in a new issue