Permalink
Browse files

Remove unnecessary -melf64_nacl

  • Loading branch information...
1 parent bd63c77 commit 9a64a10529188f146287a5e76665ab4306a41444 @johnmccutchan johnmccutchan committed Aug 15, 2012
Showing with 5 additions and 5 deletions.
  1. +4 −3 Makefile.nacl
  2. +1 −2 config/Makefile.nacl-64
View
@@ -4,11 +4,11 @@ SHELL = /bin/sh
ifeq ($(NACL_PACKAGES_BITSIZE), 32)
SYSTEM = nacl-32
BIN_EXTENSION = .x86.nexe
-CFLAGS.EXTRA = -m32 -DREGAL_LOG_ALL=0 -DNDEBUG
+CFLAGS.EXTRA = -m32
else
SYSTEM = nacl-64
BIN_EXTENSION = .x64.nexe
-CFLAGS.EXTRA = -m64 -DREGAL_LOG_ALL=0 -DNDEBUG
+CFLAGS.EXTRA = -m64
endif
REGAL_NACL = 1
SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEM) && echo 1)
@@ -73,9 +73,10 @@ LIB.SRCS += src/regal/RegalDispatchLog.cpp
LIB.SRCS += src/regal/RegalDispatchDebug.cpp
LIB.SRCS += src/regal/RegalDispatchError.cpp
LIB.SRCS += src/regal/RegalDispatchLoader.cpp
+LIB.SRCS += src/regal/RegalDispatchNacl.cpp
+LIB.SRCS += src/regal/RegalDispatchMissing.cpp
LIB.SRCS += src/regal/RegalHttp.cpp
LIB.SRCS += src/regal/RegalFavicon.cpp
-LIB.SRCS += src/regal/RegalNaCL.cpp
ifneq ($(REGAL_NACL), 1)
LIB.SRCS += src/mongoose/mongoose.c
@@ -5,14 +5,13 @@ LDFLAGS.EXTRA =
LIBDIR =
CFLAGS.EXTRA += -fPIC
CFLAGS.EXTRA += -m64
-LDFLAGS.EXTRA += -melf64_nacl
LDFLAGS.GL =
LDFLAGS.GLU = -lRegalGLU
LDFLAGS.GLUT = -lRegalGLUT
LDFLAGS.STATIC =
LDFLAGS.DYNAMIC = -shared
WARN = -Wall -W -Wno-unused-parameter
-POPT = -O2
+POPT = -g3
BIN.SUFFIX =
LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
LIB.DEVLNK = lib$(NAME).so

0 comments on commit 9a64a10

Please sign in to comment.