Skip to content

Commit

Permalink
Merge pull request #21 from ifilot/20-zipception
Browse files Browse the repository at this point in the history
20 zipception
  • Loading branch information
dionoid committed Oct 19, 2023
2 parents 5b09894 + 9e66bbf commit 7213982
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,12 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: m2000win.zip
path: build/m2000win.zip
path: |
build/m2000win.exe
build/allegro-5.2.dll
build/allegro_primitives-5.2.dll
build/allegro_image-5.2.dll
build/allegro_audio-5.2.dll
build/Default.fnt
build/P2000ROM.bin
build/BASIC.bin
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ mkdir build && cd build && cmake ../src
make -j
```

* You are done.
* The executable is placed in the `build` folder, including its dependencies. You can either directly use this executable, or use
the `.zip` file found in the same folder and deploy the emulator in another folder.

## More information on the P2000

Expand Down
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
# set minimum cmake requirements
cmake_minimum_required(VERSION 3.18)

if(${CMAKE_VERSION} VERSION_GREATER "3.24.0")
cmake_policy(SET CMP0135 NEW) # update timestamps of Allegro5 to moment of extraction
endif()

set(CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc")
set(CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++")
project(m2000win)
Expand Down

0 comments on commit 7213982

Please sign in to comment.