Update Vision to r946.

- Fixes a logging-related regression on PM-enabled builds.
This commit is contained in:
Rene Gollent
2013-10-04 22:29:20 -04:00
parent 0aa29ecc71
commit 2b1174e9bb
3 changed files with 36 additions and 15 deletions

View File

@@ -0,0 +1,16 @@
Index: Makefile
===================================================================
--- Vision/Makefile (revision 946)
+++ Vision/Makefile (working copy)
@@ -84,10 +84,7 @@
LDFLAGS := $(REG_LIBS) -nodefaultlibs
-ifeq ($(wildcard /boot/common/include/infopopper/InfoPopper.h), )
-else
- CFLAGS += -DUSE_INFOPOPPER=1
-endif
+CFLAGS += -DUSE_INFOPOPPER=1
DEP := gcc -MM -DBEOS_BUILD

View File

@@ -1,22 +1,25 @@
Index: Vision/Makefile
Index: Makefile
===================================================================
--- Vision/Makefile (revision 908)
--- Vision/Makefile (revision 946)
+++ Vision/Makefile (working copy)
@@ -21,7 +21,7 @@
BUILD_TYPE := Release
# system libs
-REG_LIBS := -lbe -ltranslation -ltextencoding -ltracker -lnetwork -lroot
+REG_LIBS := -lbe -ltranslation -ltextencoding -ltracker -lnetwork -lroot -lstdc++
# lua
LUA_LIBS := -L./src/lua/lib -llua -llualib
@@ -71,7 +71,7 @@
CFLAGS += -DBUILD_DATE=\"$(BUILDDATE)\"
CFLAGS += -fno-pic
CFLAGS += -ffast-math
-CFLAGS += -march=pentium -mcpu=pentiumpro
+CFLAGS += -march=pentium
CFLAGS += -Wall -W -Wno-multichar -Wpointer-arith
CFLAGS += -Wwrite-strings -Woverloaded-virtual
CFLAGS += -Wconversion -Wpointer-arith
@@ -84,10 +84,7 @@
LDFLAGS := $(REG_LIBS) -nodefaultlibs
-ifeq ($(wildcard /boot/common/include/infopopper/InfoPopper.h), )
-else
- CFLAGS += -DUSE_INFOPOPPER=1
-endif
+CFLAGS += -DUSE_INFOPOPPER=1
DEP := gcc -MM -DBEOS_BUILD