moving development to master for a while since there is no need for branching yet #8

Merged
htamas1210 merged 17 commits from duckdb into master 2026-01-08 14:48:10 +01:00
Showing only changes of commit 76586cc029 - Show all commits

View File

@@ -7,14 +7,12 @@ target = linux
ifeq ($(target), windows)
CC = x86_64-w64-mingw32-gcc
CXX = x86_64-w64-mingw32-g++
EXT = .exe
CFLAGS = -Wall -o2 -I$(SRCDIR) -I$(VENDORDIR)/mariadb/include -I$(VENDORDIR)/duckdb/windows/include
LIBS = -L$(VENDORDIR)/mariadb/lib -llibmariadb -L$(VENDORDIR)/duckdb/windows/lib -lduckdb
else
CC = gcc
CXX = g++
EXT =
CFLAGS = -Wall -O2 -I$(SRCDIR) `pkg-config --cflags libmariadb` -I$(VENDORDIR)/duckdb/linux/include
LIBS = `pkg-config --libs libmariadb` -L$(VENDORDIR)/duckdb/linux/lib -lduckdb
@@ -29,6 +27,7 @@ $(BUILDDIR)/$(APPNAME)$(EXT): $(OBJ)
@echo "Linking $@"
@mkdir -p $(dir $@)
$(CC) $(OBJ) -o $@ $(LIBS)
@cp vendor/duckdb/windows/lib/duckdb.dll $(BUILDDIR)
$(BUILDDIR)/%.o: $(SRCDIR)/%.c
@echo "Compiling $<"