Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Main
Synchronet
Commits
2ec2eb82
Commit
2ec2eb82
authored
4 years ago
by
deuce
Browse files
Options
Downloads
Patches
Plain Diff
Fix SDL detection.
parent
512823ca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/conio/Common.gmake
+3
-3
3 additions, 3 deletions
src/conio/Common.gmake
src/xpdev/Common.gmake
+3
-3
3 additions, 3 deletions
src/xpdev/Common.gmake
with
6 additions
and
6 deletions
src/conio/Common.gmake
+
3
−
3
View file @
2ec2eb82
...
...
@@ -63,7 +63,7 @@ endif
ifdef USE_SDL
ifndef WITH_SDL_AUDIO
ifdef SDL_CONFIG
ifeq ($(shell command -v ${SDL_CONFIG} && if [ `${SDL_CONFIG} --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
ifeq ($(shell command -v ${SDL_CONFIG}
> /dev/null
&& if [ `${SDL_CONFIG} --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
WITH_SDL := 1
endif
else
...
...
@@ -76,11 +76,11 @@ ifdef USE_SDL
CIOLIB-MT_LDFLAGS += -Wl,-rpath,@executable_path/../Frameworks
endif
else
ifeq ($(shell command -v sdl2-config && sdl2-config --cflags > /dev/null 2>&1 && echo YES),YES)
ifeq ($(shell command -v sdl2-config
> /dev/null
&& sdl2-config --cflags > /dev/null 2>&1 && echo YES),YES)
SDL_CONFIG := sdl2-config
WITH_SDL := 1
else
ifeq ($(shell command -v sdl-config && if [ `sdl-config --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
ifeq ($(shell command -v sdl-config
> /dev/null
&& if [ `sdl-config --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
SDL_CONFIG := sdl-config
WITH_SDL := 1
endif
...
...
This diff is collapsed.
Click to expand it.
src/xpdev/Common.gmake
+
3
−
3
View file @
2ec2eb82
...
...
@@ -98,7 +98,7 @@ endif
# Find SDL headers!
ifdef USE_SDL_AUDIO
ifdef SDL_CONFIG
ifeq ($(shell if [ `${SDL_CONFIG} --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
ifeq ($(shell
command -v ${SDL_CONFIG} > /dev/null &&
if [ `${SDL_CONFIG} --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
WITH_SDL_AUDIO := 1
endif
else
...
...
@@ -111,11 +111,11 @@ ifdef USE_SDL_AUDIO
CIOLIB-MT_LDFLAGS += -Wl,-rpath,@executable_path/../Frameworks
endif
else
ifeq ($(shell sdl2-config --cflags > /dev/null 2>&1 && echo YES),YES)
ifeq ($(shell
command -v sdl2-config > /dev/null &&
sdl2-config --cflags > /dev/null 2>&1 && echo YES),YES)
SDL_CONFIG := sdl2-config
WITH_SDL_AUDIO := 1
else
ifeq ($(shell if [ `sdl-config --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
ifeq ($(shell
command -v sdl-config > /dev/null &&
if [ `sdl-config --version | sed -E 's/\..*$$//'` -ge 2 ] ; then echo 'YES' ; fi),YES)
SDL_CONFIG := sdl-config
WITH_SDL_AUDIO := 1
endif
...
...
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