open.source/rosenrot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makefile: fix conflict

Browse Source
This commit is contained in:
fenze 2022-05-16 10:55:45 +02:00
parent cebd950c66
commit 556da06eff
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makefile
View File

@ -26,12 +26,7 @@ rose:
strip ./rose strip ./rose
debug: debug:
<<<<<<< HEAD
$(CC) -fPIC -o rose *.c $(CFLAGS) $(LIBS) -Wall -Wextra $(CC) -fPIC -o rose *.c $(CFLAGS) $(LIBS) -Wall -Wextra
=======
$(CC) -fPIC -o rose *.c $(CFLAGS) $(LIBS) $(OPTIONS) -Wall -Wextra \
-Wno-unused-variable
>>>>>>> 1d622de7971b8439866dfb2873d0b33004437431
config.h: config.h:
[ -f "$@" ] || cp config.def.h $@ [ -f "$@" ] || cp config.def.h $@