Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tiny build simplification #124

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Tiny build simplification #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions bindings/java/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ endif
build: .build-marker
.build-marker: ../c/include/bc.i $(CARGO_TARGET_DIR)/debug/deps/libbattlecode.a src/bc/bc_wrap.o src/bc/bcJNI.class
$(call build_command,gcc -shared -O0 -fPIC src/bc/bc_wrap.o $(CARGO_TARGET_DIR)/debug/deps/libbattlecode.a $(LIBS) -o $(TARGET))
$(call build_command,touch .build-marker && rm .release-marker 2&>/dev/null || true)
$(call build_command,touch .build-marker && rm -f .release-marker)

test: build
javac tests/*.java -classpath ./tests:./src
Expand All @@ -23,7 +23,7 @@ test: build
release: .release-marker
.release-marker: ../c/include/bc.i $(CARGO_TARGET_DIR)/release/deps/libbattlecode.a src/bc/bc_wrap.o src/bc/bcJNI.class
$(call build_command,gcc -shared -O3 -fPIC src/bc/bc_wrap.o $(CARGO_TARGET_DIR)/release/deps/libbattlecode.a $(LIBS) -o $(TARGET))
$(call build_command,touch .release-marker && rm .build-marker 2&>/dev/null || true)
$(call build_command,touch .release-marker && rm -f .build-marker)

src/bc/bc_wrap.o: src/bc/bc_wrap.c
$(call build_command,gcc -c -O3 -fPIC src/bc/bc_wrap.c $(JAVAINCLUDE) -I../c/include/ -o src/bc/bc_wrap.o)
Expand All @@ -40,6 +40,6 @@ clean:
-rm -rf src/bc/*.so
-rm -rf src/bc/*.o
-rm -rf src/bc/bc_wrap.c
-rm .build-marker .release-marker 2&>/dev/null
-rm -f .build-marker .release-marker

.PHONY: build test clean
2 changes: 1 addition & 1 deletion bindings/python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ test: build

clean:
-rm -rf battlecode/*/*.so build
-rm .build-marker .release-marker 2&>/dev/null
-rm -f .build-marker .release-marker

.PHONY: build test clean