joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 11:51:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove --disable-opengl from build scripts. typecast array entries in

Browse Source 
vga_other.cpp to get compiler to shut up about int to Bitu type
conversion.
This commit is contained in:
Jonathan Campbell 2013-10-20 10:47:54 -07:00
parent ba37aa74af
commit 6727a01157
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@ -1,5 +1,5 @@
#!/bin/bash
chmod +x configure
./configure --disable-opengl --enable-core-inline --disable-debug --prefix=/usr || exit 1
./configure --enable-core-inline --disable-debug --prefix=/usr || exit 1
make -j3 || exit 1

2
build-debug
View File

@ -1,5 +1,5 @@
#!/bin/bash
chmod +x configure
./configure --disable-opengl --enable-core-inline --enable-debug=heavy --prefix=/usr || exit 1
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr || exit 1
make -j3 || exit 1

6
src/hardware/vga_other.cpp
View File

@ -311,9 +311,9 @@ static void update_cga16_color(void) {
}
Bitu CGApal[4] = {
overscan,
2 + (color_sel||bw ? 1 : 0) + (background_i ? 8 : 0),
4 + (color_sel&&!bw? 1 : 0) + (background_i ? 8 : 0),
6 + (color_sel||bw ? 1 : 0) + (background_i ? 8 : 0)
(Bitu)(2 + (color_sel||bw ? 1 : 0) + (background_i ? 8 : 0)),
(Bitu)(4 + (color_sel&&!bw? 1 : 0) + (background_i ? 8 : 0)),
(Bitu)(6 + (color_sel||bw ? 1 : 0) + (background_i ? 8 : 0))
};
for (Bit8u x=0; x<4; x++) { // Position of pixel in question
bool even = (x & 1) == 0;