anth64/stk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Oops, fix merge conflict.

Browse Source
This commit is contained in:
anth64
2026-01-11 12:54:46 +01:00
parent fe650743b9
commit 503bd21fae
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
-7
View File
@@ -8,14 +8,7 @@ CFLAGS_DEBUG = -g -O0 -Wall -Wpedantic -I$(INC_DIR) -std=c89 -fPIC
CFLAGS_RELEASE = -O2 -Wall -Wpedantic -I$(INC_DIR) -std=c89 -fPIC CFLAGS_RELEASE = -O2 -Wall -Wpedantic -I$(INC_DIR) -std=c89 -fPIC
LDFLAGS = -ldl LDFLAGS = -ldl
<<<<<<< HEAD
# Compiler and flags
CC := cc
CFLAGS_DEBUG := -g -O0 -Wall -Wpedantic -I$(INC_DIR) -std=c89
CFLAGS_RELEASE := -O2 -Wall -Wpedantic -I$(INC_DIR) -std=c89
=======
LIB_NAME = libstk.so LIB_NAME = libstk.so
>>>>>>> 9712d47 ('simplify' make file to work across gmake and bmake)
OBJS_DEBUG = \ OBJS_DEBUG = \
$(OBJ_DIR)/debug/module.o \ $(OBJ_DIR)/debug/module.o \