Skip to content

Commit

Permalink
debugging CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Kbz-8 committed Oct 19, 2023
1 parent 08cbbfa commit 3dd055b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/macos_x86.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ jobs:
run: |
brew install SDL2
- name: Setup SDL2 frameworks
uses: BrettDong/setup-sdl2-frameworks@main
with:
sdl2: latest

# Build the lib
- name: Build MacroLibX
run: make -j
Expand Down
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# By: vvaas <vvaas@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2022/10/04 16:43:41 by maldavid #+# #+# #
# Updated: 2023/08/09 13:51:08 by maldavid ### ########.fr #
# Updated: 2023/10/19 23:31:27 by maldavid ### ########.fr #
# #
# **************************************************************************** #

Expand All @@ -19,6 +19,7 @@ SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer/**))

OBJS = $(SRCS:.cpp=.o)

OS = $(shell uname -s)
DEBUG ?= false
TOOLCHAIN ?= clang
IMAGES_OPTIMIZED ?= true
Expand All @@ -32,6 +33,12 @@ endif
CXXFLAGS = -std=c++17 -O3 -fPIC
INCLUDES = -I./includes -I./src -I./third_party

LDLIBS =

ifeq ($(OS), Darwin)
LDLIBS += -framework SDL2
endif

ifeq ($(DEBUG), true)
CXXFLAGS += -g -D DEBUG
endif
Expand All @@ -50,7 +57,7 @@ all: $(NAME)

$(NAME): $(OBJS)
@echo "\e[1;32m[linking ...]\e[1;00m "$@
@$(CXX) -shared -o $(NAME) $(OBJS)
@$(CXX) -shared -o $(NAME) $(OBJS) $(LDLIBS)
@echo "\e[1;32m[build finished]\e[1;00m"

clean:
Expand Down

0 comments on commit 3dd055b

Please sign in to comment.