mirror of
https://gitlab.com/sortix/sortix.git
synced 2023-02-13 20:55:38 -05:00
Added O=-ON and PANIC_SHORT=1 variables to the makefile.
This commit is contained in:
parent
965f3e3dbf
commit
f232a054d3
3 changed files with 14 additions and 2 deletions
5
Makefile
5
Makefile
|
@ -3,6 +3,11 @@ ifndef CPU
|
|||
MFLAGS:=CPU=$(CPU)
|
||||
endif
|
||||
|
||||
ifndef O
|
||||
O=-O2
|
||||
MFLAGS:=0=$(O)
|
||||
endif
|
||||
|
||||
ifndef SYSROOT
|
||||
SYSROOT:=$(shell pwd)/sysroot
|
||||
MFLAGS:=SYSROOT=$(SYSROOT)
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
ifndef O
|
||||
O:=-O3
|
||||
endif
|
||||
|
||||
ifndef CPU
|
||||
CPU=x86
|
||||
endif
|
||||
|
@ -44,7 +48,10 @@ ifeq ($(JSSORTIX),1)
|
|||
DEFINES:=$(DEFINES) -DPLATFORM_SERIAL -DJSSORTIX
|
||||
BUILDID:=$(BUILDID)-js
|
||||
endif
|
||||
CPPFLAGSRELEASE=-s -O3
|
||||
ifeq ($(PANIC_SHORT),1)
|
||||
DEFINES:=$(DEFINES) -DPANIC_SHORT
|
||||
endif
|
||||
CPPFLAGSRELEASE=-s $(O)
|
||||
CPPFLAGSDEBUG=
|
||||
CPPFLAGS=-I.. -I. $(CPUDEFINES) $(CPUFLAGS) -std=gnu++0x -Wall -Wextra -nostdlib -fno-builtin -nostartfiles -nodefaultlibs -fno-exceptions -fno-rtti -fno-stack-protector $(DEFINES) $(CPPFLAGSRELEASE)
|
||||
OBJS=$(CPUOBJS) \
|
||||
|
|
|
@ -32,7 +32,7 @@ using namespace Maxsi;
|
|||
|
||||
namespace Sortix
|
||||
{
|
||||
#if defined(DEBUG) || defined(PANIC_LONG)
|
||||
#if defined(DEBUG) || defined(PANIC_SHORT)
|
||||
bool longpanic = false;
|
||||
#else
|
||||
bool longpanic = true;
|
||||
|
|
Loading…
Add table
Reference in a new issue