Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
cookbook
Commits
195dffe9
Verified
Commit
195dffe9
authored
5 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Fix compilation of neverball
parent
9cfbf508
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
recipes/neverball/recipe.sh
+3
-2
3 additions, 2 deletions
recipes/neverball/recipe.sh
recipes/neverball/redox.patch
+37
-4
37 additions, 4 deletions
recipes/neverball/redox.patch
with
40 additions
and
6 deletions
recipes/neverball/recipe.sh
+
3
−
2
View file @
195dffe9
VERSION
=
1.6.0
TAR
=
"https://neverball.org/neverball-
${
VERSION
}
.tar.gz"
BUILD_DEPENDS
=(
gettext
libjpeg libogg liborbital libpng libvorbis llvm mesa sdl2 sdl2_ttf
)
BUILD_DEPENDS
=(
freetype
libjpeg libogg liborbital libpng libvorbis llvm mesa sdl2 sdl2_ttf
zlib
)
function
recipe_version
{
echo
"
$VERSION
"
...
...
@@ -16,7 +16,8 @@ function recipe_build {
sysroot
=
"
$(
realpath
../sysroot
)
"
export
CPPFLAGS
=
"-I
$sysroot
/include"
export
LDFLAGS
=
"-L
$sysroot
/lib -static"
make
ENABLE_FS
=
stdio
-j
"
$(
nproc
)
"
#TODO: Make sol using host compiler
make
-j
"
$(
nproc
)
"
ENABLE_FS
=
stdio
ENABLE_NLS
=
0 neverball neverputt
skip
=
1
}
...
...
This diff is collapsed.
Click to expand it.
recipes/neverball/redox.patch
+
37
−
4
View file @
195dffe9
diff -ruwN source/Makefile source-new/Makefile
--- source/Makefile 2019-08-07 22:16:07.630185664 -0600
+++ source-new/Makefile 2019-08-07 22:
30:34.246756435
-0600
+++ source-new/Makefile 2019-08-07 22:
48:03.915634667
-0600
@@ -38,11 +38,11 @@
ifeq ($(DEBUG),1)
CFLAGS := -g
...
...
@@ -46,12 +46,45 @@ diff -ruwN source/Makefile source-new/Makefile
ifeq ($(PLATFORM),mingw)
ifneq ($(ENABLE_NLS),0)
@@ -175,
7
+175,
7
@@
@@ -175,
8
+175,
8
@@
/usr/local/lib))
endif
-OGG_LIBS := -lvorbisfile
+OGG_LIBS := -lvorbisfile -lvorbis -logg
TTF_LIBS := -lSDL2_ttf
-TTF_LIBS := -lSDL2_ttf
+OGG_LIBS := $(shell $(PKG_CONFIG) vorbisfile --libs)
+TTF_LIBS := $(shell $(PKG_CONFIG) SDL2_ttf --libs) -lfreetype
ALL_LIBS := $(HMD_LIBS) $(TILT_LIBS) $(INTL_LIBS) $(TTF_LIBS) \
$(OGG_LIBS) $(SDL_LIBS) $(OGL_LIBS) $(BASE_LIBS)
@@ -411,11 +411,11 @@
all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) sols locales desktops
-ifeq ($(ENABLE_HMD),libovr)
+#ifeq ($(ENABLE_HMD),libovr)
LINK := $(CXX) $(ALL_CXXFLAGS)
-else
-LINK := $(CC) $(ALL_CFLAGS)
-endif
+#else
+#LINK := $(CC) $(ALL_CFLAGS)
+#endif
$(BALL_TARG) : $(BALL_OBJS)
$(LINK) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
diff -ruwN source/share/version.h source-new/share/version.h
--- source/share/version.h 2019-08-07 22:43:26.197100463 -0600
+++ source-new/share/version.h 1969-12-31 17:00:00.000000000 -0700
@@ -1,6 +0,0 @@
-#ifndef VERSION_H
-#define VERSION_H
-
-#define VERSION "1.6.0"
-
-#endif
diff -ruwN source/.version source-new/.version
--- source/.version 2019-08-07 22:43:26.197100463 -0600
+++ source-new/.version 1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-1.6.0
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment