Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,16 @@ build_MicropolisEngine:
echo "Building MicropolisEngine with Emscripten..."
cd packages/micropolis-engine ; make all

########################################################################
# build and install MicropolisEngine with AddressSanitizer

asan:
echo "Building and installing MicropolisEngine with AddressSanitizer..."
cd packages/micropolis-engine ; make install-asan

clean-asan:
cd packages/micropolis-engine ; make clean-asan

########################################################################
# build micropolis

Expand Down
1 change: 1 addition & 0 deletions packages/micropolis-engine/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build
build-asan
28 changes: 28 additions & 0 deletions packages/micropolis-engine/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ clean:
rm -rf \
$(OBJECTS) \
$(OUTPUTFILES) \
$(ASAN_BUILD) \
build


Expand Down Expand Up @@ -215,3 +216,30 @@ zone.cpp: micropolis.h


########################################################################
# Address-sanitizer build for hunting memory bugs


ASAN_BUILD = build-asan
ASAN_FLAGS = -fsanitize=address -g
ASAN_OBJECTS = $(SOURCES:%.cpp=$(ASAN_BUILD)/%.o)
ASAN_LIBRARY = $(ASAN_BUILD)/micropolisengine


asan: $(ASAN_LIBRARY)

$(ASAN_LIBRARY): $(ASAN_OBJECTS)
mkdir -p $(ASAN_BUILD)
$(EMCC) $(EMLDFLAGS) $(ASAN_FLAGS) -o $(ASAN_LIBRARY).html $^

$(ASAN_BUILD)/%.o: %.cpp $(HEADERS)
mkdir -p $(dir $@)
$(EMCC) $(EMCXXFLAGS) $(ASAN_FLAGS) -c $< -o $@

install-asan: asan
cp $(ASAN_BUILD)/micropolisengine.wasm ../../apps/micropolis/src/lib
cp $(ASAN_BUILD)/micropolisengine.data ../../apps/micropolis/src/lib
{ printf '%s\n' '// @ts-nocheck'; cat $(ASAN_BUILD)/micropolisengine.js; } > ../../apps/micropolis/src/lib/micropolisengine.js

clean-asan:
rm -rf $(ASAN_BUILD)