claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated travis (again..) and some code changes.

Browse Source
This commit is contained in:
waltje
2018-05-08 18:57:10 -04:00
parent 73d96853b0
commit 6f9f26951c
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@@ -8,7 +8,7 @@
# #
# Project file for the Travis CI remote builder service. # Project file for the Travis CI remote builder service.
# #
# Version: @(#).travis.yml 1.0.10 2018/05/08 # Version: @(#).travis.yml 1.0.11 2018/05/08
# #
# Authors: Natalia Portillo, <claunia@claunia.com> # Authors: Natalia Portillo, <claunia@claunia.com>
# Fred N. van Kempen, <decwiz@yahoo.com> # Fred N. van Kempen, <decwiz@yahoo.com>
@@ -61,16 +61,14 @@ env:
- PROG=VACRCem-dev CROSS=y DEBUG=y DEV_BUILD=y - PROG=VACRCem-dev CROSS=y DEBUG=y DEV_BUILD=y
before_install: before_install:
- sudo ps aux | grep apt # Kill off the (most likely running) APT daily update.
- sudo ps aux | grep dpkg - sudo systemctl stop apt-daily.service
- sudo rm -f /var/lib/dpkg/lock - sudo systemctl kill --kill-who=all apt-daily.service
- sleep 10 - sleep 5
- sudo apt-get install libz-mingw-w64-dev - sudo apt-get install libz-mingw-w64-dev
# - sudo apt-get install libpng-mingw-w64-dev # - sudo apt-get install libpng-mingw-w64-dev
script: script:
- ls -l /usr/i686-w64-mingw32/include
- ls -l /usr/i686-w64-mingw32/lib
- chmod +x .travis-build.sh .travis-deploy.sh - chmod +x .travis-build.sh .travis-deploy.sh
- ./.travis-build.sh - ./.travis-build.sh
@@ -83,9 +81,9 @@ addons:
- gcc-mingw-w64-x86-64 - gcc-mingw-w64-x86-64
- gcc-mingw-w64 - gcc-mingw-w64
- mingw-w64 - mingw-w64
- libz-mingw-w64 # These do not seem to be installed from here..
- libz-mingw-w64-dev # - libz-mingw-w64-dev
- libpng-mingw-w64-dev # - libpng-mingw-w64-dev
notifications: notifications:
irc: irc:

3
src/machines/m_amstrad.c
View File

@@ -32,7 +32,7 @@
* BIOSES: I need to re-do the bios.txt format so we can load non-BIOS * BIOSES: I need to re-do the bios.txt format so we can load non-BIOS
* ROM files for a given machine, such as font roms here.. * ROM files for a given machine, such as font roms here..
* *
* Version: @(#)m_amstrad.c 1.0.16 2018/05/06 * Version: @(#)m_amstrad.c 1.0.17 2018/05/08
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -73,6 +73,7 @@
#include "../timer.h" #include "../timer.h"
#include "../device.h" #include "../device.h"
#include "../nvr.h" #include "../nvr.h"
#include "../ui/ui.h"
#include "../devices/system/nmi.h" #include "../devices/system/nmi.h"
#include "../devices/system/pic.h" #include "../devices/system/pic.h"
#include "../devices/system/pit.h" #include "../devices/system/pit.h"

4
src/ui/ui_main.c
View File

@@ -11,7 +11,7 @@
* This code is called by the UI frontend modules, and, also, * This code is called by the UI frontend modules, and, also,
* depends on those same modules for lower-level functions. * depends on those same modules for lower-level functions.
* *
* Version: @(#)ui_main.c 1.0.10 2018/05/07 * Version: @(#)ui_main.c 1.0.11 2018/05/08
* *
* Author: Fred N. van Kempen, <decwiz@yahoo.com> * Author: Fred N. van Kempen, <decwiz@yahoo.com>
* *
@@ -243,9 +243,7 @@ ui_menu_toggle_video_item(int idm, int *val)
void void
ui_menu_reset_all(void) ui_menu_reset_all(void)
{ {
#ifdef ENABLE_LOG_TOGGLES
int i; int i;
#endif
#ifndef DEV_BRANCH #ifndef DEV_BRANCH
/* FIXME: until we fix these.. --FvK */ /* FIXME: until we fix these.. --FvK */