Skip to content

Fix variant suffix resolution and binary target name in makefile #33

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

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

Fix variant suffix resolution and binary target name in makefile #33

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
35 changes: 20 additions & 15 deletions makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ CUBIOMES_SRC := $(addprefix cubiomes/,biomenoise.c biomes.c finders.c generator.
LARGE_BIOMES ?= 0
UNBOUND ?= 0

ifeq (UNBOUND, 1)
BIN_SUFFIX += u
ifeq ($(LARGE_BIOMES),1)
BIN_SUFFIX := lb
else
BIN_SUFFIX := sb
endif

ifeq (LARGE_BIOMES, 1)
BIN_SUFFIX += lb
else
BIN_SUFFIX += sb
ifeq ($(UNBOUND),1)
BIN_SUFFIX := $(BIN_SUFFIX)u
endif

PRINT_INTERVAL ?= 256
Expand All @@ -34,21 +34,26 @@ override CFLAGS += -O3
override CXXFLAGS += -O3 -std=c++20 -I asio/asio/include -DOMISSION_LARGE_BIOMES=$(LARGE_BIOMES) -DOMISSION_UNBOUND=$(UNBOUND) -DPRINT_INTERVAL=$(PRINT_INTERVAL)
override NVCC_FLAGS += $(CXXFLAGS) --expt-relaxed-constexpr --default-stream per-thread -arch=$(ARCH) -use_fast_math

.PHONY: all clean

ifeq ($(OS),Windows_NT)
all: main.exe
BIN := main-$(BIN_SUFFIX).exe

all: $(BIN)

SRC_CPP := $(wildcard src/*.cpp)
SRC_C := $(wildcard src/*.c)
SRC_CU := $(wildcard src/*.cu)
SRC := $(SRC_CPP) $(SRC_C) $(SRC_CU)

clean:
del /Q main.exe
-del /Q main-*.exe

# nvcc src/*.cpp src/*.c src/*.cu -o main.exe cubiomes/biomenoise.c cubiomes/biomes.c cubiomes/finders.c cubiomes/generator.c cubiomes/layers.c cubiomes/noise.c -arch=native -O3 -std=c++20 -I asio-1.34.2/include -DOMISSION_LARGE_BIOMES=1 --expt-relaxed-constexpr --default-stream per-thread -D_WIN32_WINNT=0x0601
main.exe: $(SRC) $(CUBIOMES_SRC)
nvcc $(SRC) $(CUBIOMES_SRC) -o $@-$(BIN_SUFFIX) $(NVCC_FLAGS) -D_WIN32_WINNT=0x0601
$(BIN): $(SRC) $(CUBIOMES_SRC)
nvcc $(SRC) $(CUBIOMES_SRC) -o $@ $(NVCC_FLAGS) -D_WIN32_WINNT=0x0601
else
BIN := main-$(BIN_SUFFIX)

override NVCC_FLAGS += -ccbin $(CXX)

MAIN_SRC := src/main.cpp
Expand Down Expand Up @@ -78,10 +83,10 @@ else
MAIN_CXXFLAGS += -DNO_NET
endif

all: main
all: $(BIN)

clean:
rm -f main libcubiomes.a biomenoise.o biomes.o finders.o generator.o layers.o noise.o cubiomes.o gpu.o cpu.o client.o server.o
rm -f main main-* libcubiomes.a biomenoise.o biomes.o finders.o generator.o layers.o noise.o cubiomes.o gpu.o cpu.o client.o server.o

libcubiomes.a: $(CUBIOMES_SRC)
$(CC) -c $(CUBIOMES_SRC) -fwrapv $(CFLAGS)
Expand All @@ -102,6 +107,6 @@ client.o: src/client.cpp src/client.h src/common.h
server.o: src/server.cpp src/server.h src/common.h
$(CXX) -c $< -o $@ $(CXXFLAGS)

main: $(MAIN_DEP)
$(MAIN_CXX) $(MAIN_SRC) -o $@-$(BIN_SUFFIX) $(MAIN_CXXFLAGS)
$(BIN): $(MAIN_DEP)
$(MAIN_CXX) $(MAIN_SRC) -o $@ $(MAIN_CXXFLAGS)
endif