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
e34537a7
Commit
e34537a7
authored
17 years ago
by
deuce
Browse files
Options
Downloads
Patches
Plain Diff
Allow passing SDL_FRAMEWORK_PATH on the make commandline.
parent
992359c8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/conio/Common.gmake
+8
-5
8 additions, 5 deletions
src/conio/Common.gmake
with
8 additions
and
5 deletions
src/conio/Common.gmake
+
8
−
5
View file @
e34537a7
...
...
@@ -58,8 +58,11 @@ ifdef USE_SDL
else
ifeq ($(os),darwin)
ifeq ($(shell if [ -d /Library/Frameworks/SDL.framework ] ; then echo YES ; fi),YES)
WITH_SDL := 1
SDL_FRAMEWORK_PATH ?= /Library/Frameworks
endif
ifdef SDL_FRAMEWORK_PATH
WITH_SDL := 1
endif
else
ifeq ($(shell sdl-config --cflags > /dev/null 2>&1 && echo YES),YES)
SDL_CONFIG := sdl-config
...
...
@@ -122,11 +125,11 @@ ifdef WITH_SDL
CIOLIB-MT_CFLAGS += -DWITH_SDL -DSTATIC_SDL
WITH_SDL := 1
STATIC_SDL := 1
CIOLIB-MT_CFLAGS += -I
/Library/Frameworks
/SDL.framework/Headers
CIOLIB-MT_LIBS += -framework SDL -framework Cocoa -framework Carbon -I
/Library/Frameworks
/SDL.framework/Headers
CIOLIB-MT_CFLAGS += -I
${SDL_FRAMEWORK_PATH}
/SDL.framework/Headers
CIOLIB-MT_LIBS +=
-F${SDL_FRAMEWORK_PATH}
-framework SDL -framework Cocoa -framework Carbon -I
${SDL_FRAMEWORK_PATH}
/SDL.framework/Headers
CIOLIB_CFLAGS += -DWITH_SDL -DSTATIC_SDL
CIOLIB_CFLAGS += -I
/Library/Frameworks
/SDL.framework/Headers
CIOLIB_LIBS += -framework SDL -framework Cocoa -framework Carbon -I
/Library/Frameworks
/SDL.framework/Headers
CIOLIB_CFLAGS += -I
${SDL_FRAMEWORK_PATH}
/SDL.framework/Headers
CIOLIB_LIBS +=
-F${SDL_FRAMEWORK_PATH}
-framework SDL -framework Cocoa -framework Carbon -I
${SDL_FRAMEWORK_PATH}
/SDL.framework/Headers
endif
endif
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