valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix some gcc compilation issues

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2457
This commit is contained in:
Sjoerd van der Berg 2006-01-30 10:55:49 +00:00
parent 78f4e566bc
commit 952f8f0d1d
7 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -296,6 +296,8 @@ src/gui/Makefile
src/hardware/Makefile
src/hardware/serialport/Makefile
src/ints/Makefile
src/libs/Makefile
src/libs/zmbv/Makefile
src/misc/Makefile
src/shell/Makefile
src/platform/Makefile

5
src/Makefile.am
View file

@ -1,10 +1,11 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
SUBDIRS = cpu debug dos fpu gui hardware ints misc shell platform
SUBDIRS = cpu debug dos fpu gui hardware libs ints misc shell platform
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
ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a \
libs/zmbv/libzmbv.a

3
src/hardware/vga_draw.cpp
View file

@ -237,6 +237,7 @@ static Bit8u * VGA_Draw_VGA_Line_HWMouse(Bitu vidstart, Bitu panning, Bitu line)
static Bit32u FontMask[2]={0xffffffff,0x0};
static Bit8u * VGA_TEXT_Draw_Line(Bitu vidstart,Bitu panning,Bitu line) {
Bitu font_addr;
Bit32u * draw=(Bit32u *)TempLine;
Bit8u * vidmem=&vga.gfxmem_start[vidstart];
for (Bitu cx=0;cx<vga.draw.blocks;cx++) {
@ -251,7 +252,7 @@ static Bit8u * VGA_TEXT_Draw_Line(Bitu vidstart,Bitu panning,Bitu line) {
*draw++=fg&mask2 | bg&~mask2;
}
if (!vga.draw.cursor.enabled || !(vga.draw.cursor.count&0x8)) goto skip_cursor;
Bitu font_addr=(vga.draw.cursor.address-vidstart) >> 1;
font_addr = (vga.draw.cursor.address-vidstart) >> 1;
if (font_addr>=0 && font_addr<vga.draw.blocks) {
if (line<vga.draw.cursor.sline) goto skip_cursor;
if (line>vga.draw.cursor.eline) goto skip_cursor;

3
src/libs/Makefile.am Normal file
View file

@ -0,0 +1,3 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
SUBDIRS = zmbv

4
src/libs/zmbv/Makefile.am Normal file
View file

@ -0,0 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LIBRARIES = libzmbv.a
libzmbv_a_SOURCES = zmbv.cpp zmbv.h

5
src/libs/zmbv/zmbv.cpp
View file

@ -18,6 +18,7 @@
#include <zlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
@ -396,10 +397,10 @@ void VideoCodec::UnXorFrame(void) {
workPos=(workPos + blockcount*2 + 3) & ~3;
for (int b=0;b<blockcount;b++) {
FrameBlock * block=&blocks[b];
int xor = vectors[b*2+0] & 1;
int delta = vectors[b*2+0] & 1;
int vx = vectors[b*2+0] >> 1;
int vy = vectors[b*2+1] >> 1;
if (xor) UnXorBlock<P>(vx,vy,block);
if (delta) UnXorBlock<P>(vx,vy,block);
else CopyBlock<P>(vx,vy,block);
}
}

8
src/libs/zmbv/zmbv.h
View file

@ -16,8 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef DOSBOX_DOSBOX_H
#ifdef _MSC_VER
#define INLINE __forceinline
#else
#define INLINE inline
#endif
#endif
#define CODEC_4CC "ZMBV"
typedef enum {