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
2cb2d203
Commit
2cb2d203
authored
11 months ago
by
Deucе
Browse files
Options
Downloads
Patches
Plain Diff
Apparently -framework is a link flag, not a compile one
parent
50f3281d
No related branches found
No related tags found
No related merge requests found
Pipeline
#6162
failed
11 months ago
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/build/Common.gmake
+6
-12
6 additions, 12 deletions
src/build/Common.gmake
src/conio/Common.gmake
+1
-1
1 addition, 1 deletion
src/conio/Common.gmake
src/xpdev/Common.gmake
+1
-1
1 addition, 1 deletion
src/xpdev/Common.gmake
with
8 additions
and
14 deletions
src/build/Common.gmake
+
6
−
12
View file @
2cb2d203
...
...
@@ -436,19 +436,13 @@ else
endif
SHLIBOPTS := -shared
ifeq ($(os),
darwin
)
MKSHLIB
:=
libtool -dynamic -framework System -lcc_dynamic
MKSHPPLIB
:=
libtool -dynamic -framework System -lcc_dynamic -lstdc++
SHLIBOPTS
:=
ifeq ($(os),
sunos
)
MKSHLIB :=
/usr/ccs/bin/ld -G
MKSHPPLIB :=
/usr/ccs/bin/ld -G
SHLIBOPTS :=
else
ifeq ($(os),sunos)
MKSHLIB := /usr/ccs/bin/ld -G
MKSHPPLIB := /usr/ccs/bin/ld -G
SHLIBOPTS :=
else
MKSHLIB := $(CC)
MKSHPPLIB := $(CXX)
endif
MKSHLIB := $(CC)
MKSHPPLIB := $(CXX)
endif
# Paths
...
...
This diff is collapsed.
Click to expand it.
src/conio/Common.gmake
+
1
−
1
View file @
2cb2d203
...
...
@@ -103,7 +103,7 @@ ifdef USE_SDL
ifeq ($(os),darwin)
ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES)
SDL_FRAMEWORK_PATH ?= /Library/Frameworks
CFLAGS += -F${SDL_FRAMEWORK_PATH}
-framework SDL2
CFLAGS += -F${SDL_FRAMEWORK_PATH}
endif
ifdef SDL_FRAMEWORK_PATH
WITH_SDL := 1
...
...
This diff is collapsed.
Click to expand it.
src/xpdev/Common.gmake
+
1
−
1
View file @
2cb2d203
...
...
@@ -105,7 +105,7 @@ ifdef USE_SDL_AUDIO
ifeq ($(os),darwin)
ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES)
SDL_FRAMEWORK_PATH ?= /Library/Frameworks
CFLAGS += -F${SDL_FRAMEWORK_PATH}
-framework SDL2
CFLAGS += -F${SDL_FRAMEWORK_PATH}
endif
ifdef SDL_FRAMEWORK_PATH
WITH_SDL_AUDIO := 1
...
...
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