Linux build compatibility.

Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2017-11-27 21:33:23 +00:00
parent 11062607e6
commit befcda2c0e
2 changed files with 3 additions and 32 deletions

View File

@ -114,7 +114,7 @@ void EightBit::GameBoy::Bus::validateCartridgeType() {
default:
if (romSizeSpecification > 6)
throw std::domain_error("Invalid ROM size specification");
gameRomBanks = 1i64 << (romSizeSpecification + 1);
gameRomBanks = 1 << (romSizeSpecification + 1);
if (gameRomBanks != m_gameRomBanks.size())
throw std::domain_error("ROM size specification mismatch");
}

View File

@ -1,36 +1,7 @@
LIB = liblr35902.a
CXXFLAGS = -Wall -std=c++14 -pipe -I ../inc -I ../../inc
CXXFLAGS = -I ../inc -I ../../inc
CXXFILES = CharacterDefinition.cpp Disassembler.cpp Display.cpp GameBoyBus.cpp IoRegisters.cpp LR35902.cpp ObjectAttribute.cpp Profiler.cpp
CXXOBJECTS = $(CXXFILES:.cpp=.o)
SOURCES = $(CXXFILES)
OBJECTS = $(CXXOBJECTS)
PCH = stdafx.h.gch
all: opt
opt: CXXFLAGS += -DNDEBUG -march=native -O3 -flto
opt: $(LIB)
debug: CXXFLAGS += -g -D_DEBUG
debug: $(LIB)
coverage: CXXFLAGS += -g -D_DEBUG -fprofile-arcs -ftest-coverage
coverage: $(LIB)
$(PCH): stdafx.h
$(CXX) $(CXXFLAGS) -x c++-header $<
$(LIB): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIB) $(OBJECTS)
%.o: %.cpp $(PCH)
$(CXX) $(CXXFLAGS) $< -c -o $@
.PHONY: clean
clean:
-rm -f $(LIB) $(OBJECTS) $(PCH)
include ../../lib_build.mk