mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-25 07:52:59 +03:00
reboot!
This commit is contained in:
parent
0f3c7d5303
commit
7711cde6de
8
Makefile
8
Makefile
@ -64,7 +64,15 @@ INCLUDE=i
|
|||||||
MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
|
MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
|
||||||
|
|
||||||
# NOTFORCHECKIN - restore -O3
|
# NOTFORCHECKIN - restore -O3
|
||||||
|
<<<<<<< Updated upstream
|
||||||
CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
|
CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
|
||||||
|
||||||| merged common ancestors
|
||||||
|
# -DGHETTO
|
||||||
|
CFLAGS= $(COSFLAGS) -g -msse3 -ffast-math \
|
||||||
|
=======
|
||||||
|
# -DGHETTO
|
||||||
|
CFLAGS= $(COSFLAGS) -msse3 -ffast-math \
|
||||||
|
>>>>>>> Stashed changes
|
||||||
-funsigned-char \
|
-funsigned-char \
|
||||||
-I/usr/local/include \
|
-I/usr/local/include \
|
||||||
-I/opt/local/include \
|
-I/opt/local/include \
|
||||||
|
Loading…
Reference in New Issue
Block a user