Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update makefile.yml #8

Merged
merged 2 commits into from
Oct 21, 2024
+16 −6
Merged

Update makefile.yml #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ec6c85
Reconcile difference in type of UtilityBase between NDK 3.9 and NDK 3.2
mheyer32 Oct 21, 2024
6864ca9
Update makefile.yml
mheyer32 Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/makefile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run the build process with Docker
uses: addnab/docker-run-action@v3
Expand All @@ -22,7 +22,7 @@ jobs:
cd source
make os3 release

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Dopus5_92_dev_os3_debug
path: releases/Dopus5_92_dev_os3_debug.zip
Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run the build process with Docker
uses: addnab/docker-run-action@v3
Expand All @@ -42,7 +42,7 @@ jobs:
cd source
make os3 release debug=no

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Dopus5_92_os3
path: releases/Dopus5_92_os3.zip
path: releases/Dopus5_92_os3.zip
12 changes: 11 additions & 1 deletion source/Include/dopus/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include <proto/asl.h>
#include <proto/gadtools.h>
#include <proto/console.h>
#include <proto/utility.h>
#include <proto/timer.h>
#include <proto/diskfont.h>
#include <proto/input.h>
Expand Down Expand Up @@ -83,6 +82,17 @@
#ifdef __amigaos3__
#include <clib/alib_protos.h>
#include <intuition/intuitionbase.h>
// Declare Utilitybase ourselves as NDK3.9 and NDK 3.2 can't agree on the type.
#define __NOLIBBASE__
#include <proto/utility.h>
extern struct Library *
# ifdef __CONSTLIBBASEDECL__
__CONSTLIBBASEDECL__
# endif /* __CONSTLIBBASEDECL__ */
UtilityBase;
#undef __NOLIBBASE__
#else
#include <proto/utility.h>
#endif

#ifdef __MORPHOS__
Expand Down