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

Jump to bottom

Fix build & Github CI #33

Merged
merged 3 commits into from
Mar 16, 2024
Merged

Fix build & Github CI #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7275a6
fix gcc2 build
korli Mar 16, 2024
f3ebc3b
fix x86_64 build
korli Mar 16, 2024
16a8ed1
add Github Actions CI
korli Mar 16, 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
29 changes: 29 additions & 0 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: "haiku-ci"
on: [push, pull_request]

jobs:
build-haiku:
timeout-minutes: 60
runs-on: ${{ matrix.config.runner }}
name: build-${{ matrix.config.os }}-${{ matrix.config.version }}-${{ matrix.config.architecture }}

strategy:
fail-fast: false
matrix:
config:
# The OS versions supported are specific to the version of the action
# https://github.com/cross-platform-actions/action/blob/master/changelog.md
- { os: haiku, version: 'r1beta4', runner: 'ubuntu-latest', architecture: 'x86-64' }
- { os: haiku, version: 'r1beta4', runner: 'ubuntu-latest', architecture: 'x86' }

steps:
- uses: actions/checkout@v4

- uses: korli/action@v0.23.0-haiku
with:
operating_system: ${{ matrix.config.os }}
version: ${{ matrix.config.version }}
architecture: ${{ matrix.config.architecture }}
run: |
ssh user@localhost "pkgman update -y haiku_devel devel:libz cmd:jam cmd:gcc cmd:nasm" &&
jam -q
2 changes: 1 addition & 1 deletion source/BecassoMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void generate_alphabuffer (char *alpha)
gAlphaBuffer[253] = schar[1];
gAlphaBuffer[254] = schar[2];
gAlphaBuffer[255] = schar[3];
char xAlphaMask[256] = { KEYFILE_MASK };
uchar xAlphaMask[256] = { KEYFILE_MASK };
char wbuffer[256];
for (i = 0; i < 255; i++)
wbuffer[i] = gAlphaBuffer[i] ^ xAlphaMask[i];
Expand Down
2 changes: 0 additions & 2 deletions source/BitmapStuff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
#include <Debug.h>
#include <Node.h>

#define bzero(p,n) memset(p,0,n)

#if defined (DATATYPES)
# include "Datatypes.h"
#endif
Expand Down
1 change: 0 additions & 1 deletion source/CanvasTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <bsd_mem.h> // for bzero() since R4.1
#include "PosView.h"

// #define USE_THREAD_FOR_POSITION
Expand Down
2 changes: 1 addition & 1 deletion source/CanvasView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4292,7 +4292,7 @@ void CanvasView::CopyTarget (BMessage *message)
message->PrintToStream();
}

extern bool gGlobalAlpha;
extern int gGlobalAlpha;
if (!gGlobalAlpha)
{
#if SAVE_DISABLED
Expand Down
4 changes: 1 addition & 3 deletions source/Layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#include <string.h>
#include <stdlib.h>

#define bzero(p,n) memset(p,0,n)

Layer::Layer (BRect bounds, const char *name)
: BBitmap (bounds, B_BITMAP_ACCEPTS_VIEWS, B_RGBA32)
{
Expand Down Expand Up @@ -50,4 +48,4 @@ void Layer::ClearTo (bgra_pixel p)
bgra_pixel *d = (bgra_pixel *) Bits() - 1;
for (int32 i = 0; i < BitsLength()/4; i++)
*(++d) = p;
}
}
2 changes: 0 additions & 2 deletions source/add-ons/Quantize/Quantize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#include <RadioButton.h>
#include <Box.h>

#define bzero(p,n) memset (p, 0, n)

int16 *gLut = 0;

#define FOREGROUND 0
Expand Down