mirror of
https://gitlab.com/octospacc/MultiSpaccSDK
synced 2025-04-15 11:17:19 +02:00
Some build fixes
This commit is contained in:
parent
80f9b7e76a
commit
7dc6db8b3f
@ -1,12 +1,15 @@
|
|||||||
image: debian:latest
|
image: debian:latest
|
||||||
|
|
||||||
before_script: |
|
before_script: |
|
||||||
bash ./Tools/InstallBuildEnvironment.sh
|
sh ./Tools/InstallBuildEnvironment.sh
|
||||||
|
|
||||||
Tests:
|
Tests:
|
||||||
stage: build
|
stage: build
|
||||||
script: |
|
script: |
|
||||||
source .env
|
source .env
|
||||||
make -j$(nproc --all)
|
make -j$(nproc --all)
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- LibMultiSpacc/Examples/
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
|
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
|
||||||
|
@ -131,7 +131,7 @@ else
|
|||||||
BuildDir = ./Build/$(BuildProcess)
|
BuildDir = ./Build/$(BuildProcess)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# TODO: Fix include substitutions properly in this, and make all custom build processes lest wasteful of operations
|
# TODO: Fix include substitutions properly in this, and make all custom build processes less wasteful of operations
|
||||||
define PrepareTargetBuildDir
|
define PrepareTargetBuildDir
|
||||||
mkdir -p $(BuildDir)/.tmp $(BuildDirSources)/.tmp
|
mkdir -p $(BuildDir)/.tmp $(BuildDirSources)/.tmp
|
||||||
|
|
||||||
|
BIN
LibMultiSpacc/Examples/HelloWorld/CHARS2.png
Normal file
BIN
LibMultiSpacc/Examples/HelloWorld/CHARS2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 773 B |
@ -18,6 +18,13 @@ extern "C" {
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#ifndef MultiSpacc_Target_SDLCommon
|
||||||
|
#if defined(MultiSpacc_Target_SDL12) || defined(MultiSpacc_Target_SDL20)
|
||||||
|
#define MultiSpacc_Target_SDLCommon
|
||||||
|
#define MultiSpacc_Target_SDLCom // TODO deprecate
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef MultiSpacc_Target_SDL12
|
#ifdef MultiSpacc_Target_SDL12
|
||||||
#include <SDL/SDL.h>
|
#include <SDL/SDL.h>
|
||||||
#include <SDL/SDL_image.h>
|
#include <SDL/SDL_image.h>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/sh
|
||||||
|
|
||||||
#[ "$(whoami)" != root ] && {
|
#[ "$(whoami)" != root ] && {
|
||||||
echo "This script must probably run as root".
|
echo "This script must probably run as root".
|
||||||
|
Loading…
x
Reference in New Issue
Block a user