diff --git a/Makefile b/Makefile index eb79ac0..ab9e1d3 100644 --- a/Makefile +++ b/Makefile @@ -6,35 +6,24 @@ GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags) GOFLAGS ?= -ldflags="-s -w -X lon-tool/cmd.version=$(GIT_VERSION)" WINDOWS_GOFLAGS ?= -ldflags="-extldflags=-static -s -w -X lon-tool/cmd.version=$(GIT_VERSION)" -# macOS settings -MACOS_BIN = $(BIN_DIR)/$(NAME)_mac_amd64 -MACOS_CC = x86_64-apple-darwin23-gcc-14 -MACOS_CXX = x86_64-apple-darwin23-g++-14 - # Windows settings WINDOWS_BIN = $(BIN_DIR)/$(NAME)_win_amd64.exe WINDOWS_CC = x86_64-w64-mingw32-gcc WINDOWS_CXX = x86_64-w64-mingw32-g++ -WINDOWS_PKG_CONFIG_PATH = /usr/local/x86_64-w64-mingw32/lib/pkgconfig -WINDOWS_CGO_CFLAGS = -I/usr/local/x86_64-w64-mingw32/include -WINDOWS_CGO_LDFLAGS = -L/usr/local/x86_64-w64-mingw32/lib +WINDOWS_PKG_CONFIG_PATH = /usr/x86_64-w64-mingw32/lib/pkgconfig +WINDOWS_CGO_CFLAGS = -I/usr/x86_64-w64-mingw32/include +WINDOWS_CGO_LDFLAGS = -L/usr/x86_64-w64-mingw32/lib # Linux settings LINUX_BIN = $(BIN_DIR)/$(NAME)_lin_amd64 LINUX_CC = x86_64-linux-gnu-gcc LINUX_CXX = x86_64-linux-gnu-g++ -LINUX_PKG_CONFIG_PATH = /usr/local/x86_64-linux-gnu/lib/pkgconfig -LINUX_CGO_CFLAGS = -I/usr/local/x86_64-linux-gnu/include -LINUX_CGO_LDFLAGS = -L/usr/local/x86_64-linux-gnu/lib +LINUX_PKG_CONFIG_PATH = /usr/lib/pkgconfig +LINUX_CGO_CFLAGS = -I/usr/include +LINUX_CGO_LDFLAGS = -L/usr/lib # Targets -all: macos windows linux - -macos: - @echo "Building macos bin" - @export CGO_ENABLED=1 GOARCH=amd64 GOOS=darwin CC=$(MACOS_CC) CXX=$(MACOS_CXX) && \ - go build $(GOFLAGS) -o $(MACOS_BIN) $(SRC) && \ - echo "- saved to $(MACOS_BIN)" +all: windows linux windows: @echo "Building windows bin"