Skip to content
This repository has been archived by the owner on Feb 12, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
caiiiycuk committed Oct 3, 2017
1 parent ebd0ca5 commit acb81ef
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
12 changes: 11 additions & 1 deletion js-dos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,14 @@ js-dos

The aim of the project is to provide nice web-API for em-dosbox.

uztool - is a tool for extraction zip archives
uztool - is a tool for extraction zip archives

# How to build

```
cd js-dos
mkdir build
cd build
./emcmake cmake ../api
make -j4
```
3 changes: 2 additions & 1 deletion js-dos/api/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 2.8)
project(js-dos)

set(CMAKE_BUILD_TYPE Release)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-implicit-function-declaration")
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -Wno-implicit-function-declaration")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
set(ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../..")

if(EMSCRIPTEN)
Expand Down
3 changes: 2 additions & 1 deletion src/dosbox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,9 @@ void DOSBOX_RunMachine(void){
* Anything taking a long time will probably run indefinitely,
* making DOSBox appear to hang.
*/
if (GetTicks() - ticksStart > 1000) {
if (GetTicks() - ticksStart > 10000) {
LOG_MSG("Emulation aborted due to nested emulation timeout.");
printf("Ticks passed %d\n", GetTicks() - ticksStart);
em_exit(1);
break;
}
Expand Down

0 comments on commit acb81ef

Please sign in to comment.