Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Kit Redgrave
SRB2
Commits
df895638
Commit
df895638
authored
May 19, 2016
by
Kit Redgrave
Browse files
Options
Downloads
Patches
Plain Diff
Add a way to build OS X binaries (not .app) through Makefiles
parent
928c6acf
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/Makefile
+14
-0
14 additions, 0 deletions
src/Makefile
src/Makefile.cfg
+11
-0
11 additions, 0 deletions
src/Makefile.cfg
src/doomtype.h
+1
-1
1 addition, 1 deletion
src/doomtype.h
src/sdl/MakeNIX.cfg
+9
-0
9 additions, 0 deletions
src/sdl/MakeNIX.cfg
with
35 additions
and
1 deletion
src/Makefile
+
14
−
0
View file @
df895638
...
...
@@ -189,6 +189,10 @@ ifdef FREEBSD
UNIXCOMMON
=
1
endif
ifdef
MACOSX
UNIXCOMMON
=
1
endif
ifdef
NDS
NOPNG
=
1
NONET
=
1
...
...
@@ -588,11 +592,16 @@ ifndef WINDOWSHELL
-$(
GZIP
)
$(
GZIP_OPT2
)
$(
BIN
)
/
$(
DBGNAME
)
.txt
endif
endif
# i dont know why, but the os x executable absolutely hates
# being touched by objcopy. so let's not do it
ifndef
MACOSX
ifndef
PSP
$(OBJCOPY)
$(BIN)/$(EXENAME)
$(BIN)/$(DBGNAME)
$(OBJCOPY)
--strip-debug
$(BIN)/$(EXENAME)
-$(OBJCOPY)
--add-gnu-debuglink
=
$(
BIN
)
/
$(
DBGNAME
)
$(
BIN
)
/
$(
EXENAME
)
endif
endif
ifndef
NOUPX
-$(UPX)
$(UPX_OPTS)
$(BIN)/$(EXENAME)
endif
...
...
@@ -737,6 +746,11 @@ $(OBJDIR)/%.o: %.c
$(OBJDIR)/%.o
:
$(INTERFACE)/%.c
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
ifdef
MACOSX
$(OBJDIR)/%.o
:
sdl/macosx/%.c
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
endif
$(OBJDIR)/%.o
:
hardware/%.c
$(
CC
)
$(
CFLAGS
)
$(
WFLAGS
)
-c
$<
-o
$@
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.cfg
+
11
−
0
View file @
df895638
...
...
@@ -403,6 +403,17 @@ else
WINDRES
=
windres
endif
# because Apple screws with us on this
# need to get bintools from homebrew
# need to get gzip from homebrew (it's in dupes)
ifdef
MACOSX
CC
=
clang
CXX
=
clang
OBJCOPY
=
gobjcopy
OBJDUMP
=
gobjdump
GZIP
=
/usr/local/bin/gzip
endif
OBJDUMP_OPTS?=--wide
--source
--line-numbers
LD
=
$(CC)
...
...
This diff is collapsed.
Click to expand it.
src/doomtype.h
+
1
−
1
View file @
df895638
...
...
@@ -92,7 +92,7 @@ typedef long ssize_t;
#endif
#ifdef __APPLE_CC__
#define DIRECTFULLSCREEN
#define DIRECTFULLSCREEN
1
#define DEBUG_LOG
#define NOIPX
#endif
...
...
This diff is collapsed.
Click to expand it.
src/sdl/MakeNIX.cfg
+
9
−
0
View file @
df895638
...
...
@@ -56,6 +56,15 @@ ifdef FREEBSD
LIBS+=-lipx
-lkvm
endif
#
#here is Mac OS X
#
ifdef
MACOSX
OBJS+=$(OBJDIR)/mac_resources.o
OBJS+=$(OBJDIR)/mac_alert.o
LIBS+=-framework
CoreFoundation
endif
#
#here is GP2x (arm-gp2x-linux)
#
...
...
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