kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Added O=-ON and PANIC_SHORT=1 variables to the makefile.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2011-11-28 15:25:00 +01:00
parent 965f3e3dbf
commit f232a054d3
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -3,6 +3,11 @@ ifndef CPU
MFLAGS:=CPU=$(CPU) MFLAGS:=CPU=$(CPU)
endif endif
ifndef O
O=-O2
MFLAGS:=0=$(O)
endif
ifndef SYSROOT ifndef SYSROOT
SYSROOT:=$(shell pwd)/sysroot SYSROOT:=$(shell pwd)/sysroot
MFLAGS:=SYSROOT=$(SYSROOT) MFLAGS:=SYSROOT=$(SYSROOT)

9
sortix/Makefile
View file

@ -1,3 +1,7 @@
ifndef O
O:=-O3
endif
ifndef CPU ifndef CPU
CPU=x86 CPU=x86
endif endif
@ -44,7 +48,10 @@ ifeq ($(JSSORTIX),1)
DEFINES:=$(DEFINES) -DPLATFORM_SERIAL -DJSSORTIX DEFINES:=$(DEFINES) -DPLATFORM_SERIAL -DJSSORTIX
BUILDID:=$(BUILDID)-js BUILDID:=$(BUILDID)-js
endif endif
CPPFLAGSRELEASE=-s -O3 ifeq ($(PANIC_SHORT),1)
DEFINES:=$(DEFINES) -DPANIC_SHORT
endif
CPPFLAGSRELEASE=-s $(O)
CPPFLAGSDEBUG= 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) 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) \ OBJS=$(CPUOBJS) \

2
sortix/panic.cpp
View file

@ -32,7 +32,7 @@ using namespace Maxsi;
namespace Sortix namespace Sortix
{ {
#if defined(DEBUG) || defined(PANIC_LONG) #if defined(DEBUG) || defined(PANIC_SHORT)
bool longpanic = false; bool longpanic = false;
#else #else
bool longpanic = true; bool longpanic = true;