Skip to content

Commit 0aa2608

Browse files
committed
Add 64-bit compile flag on MacOS
1 parent ce70a3e commit 0aa2608

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

.github/workflows/core-lint.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Core Lint
2+
3+
on:
4+
push: {}
5+
pull_request: {}
6+
7+
jobs:
8+
core-lint:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: Run Core no-OO linter
13+
run: |
14+
bash tools/check_no_oo.sh Core

MacOS/makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Purpose: Builds the application into a standalone .app bundle for distribution
44

55
CC = clang++
6-
CFLAGS = -std=c++11 -Wall -mmacosx-version-min=10.9
6+
CFLAGS = -std=c++11 -Wall -mmacosx-version-min=10.9 -arch x86_64
77
LFLAGS = -mmacosx-version-min=10.9
88
INCS = -I$(CURDIR)/frameworks/sdl/include/ \
99
-I$(CURDIR)/../frameworks/imgui/
@@ -22,7 +22,7 @@ $(APPNAME): objects
2222
# Compiling main executable
2323
$(CC) $(CFLAGS) $(LIBS) $(INCS) *.o -o $@ $(LFLAGS)
2424

25-
# Removing leftover objects
25+
# Removing leftover objects
2626
$(RM) *.o
2727

2828
# Creating empty .app bundle
@@ -33,7 +33,7 @@ $(APPNAME): objects
3333
cp frameworks/sdl/lib/libSDL2-2.0.0.dylib [email protected]/Contents/Frameworks/libSDL2-2.0.0.dylib
3434

3535
# Re-linking the dylibs to newly compiled executable
36-
install_name_tool -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @executable_path/../Frameworks/libSDL2-2.0.0.dylib $@
36+
install_name_tool -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @executable_path/../Frameworks/libSDL2-2.0.0.dylib $@
3737

3838
# Moving the configured executable and copying other files into .app bundle
3939
@@ -52,7 +52,7 @@ test_release:
5252
# Runs the program with an attached terminal (Application must be built prior)
5353
test_debug:
5454
./release/$(APPNAME).app/Contents/MacOS/$(APPNAME) \
55-
55+
5656

5757
# Removes latest build and object files
5858
clean:
-26 KB
Binary file not shown.

0 commit comments

Comments
 (0)