From: Egor Date: Tue, 21 Jan 2025 02:49:50 +0000 (+0200) Subject: add an experimental c++-mode build X-Git-Url: https://git.patchysicp.xyz/?a=commitdiff_plain;h=0172c07fd62f43211de5e28db09f8f94bd27bb13;p=patchyircd.git add an experimental c++-mode build --- diff --git a/Makefile b/Makefile index 5b193d6..98312d4 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,7 @@ HEADERS := \ ifdef USE_LUA CFLAGS += -DHAS_LUA $(shell pkg-config --cflags lua5.4) +CXXFLAGS += -DHAS_LUA $(shell pkg-config --cflags lua5.4) LDLIBS += $(shell pkg-config --libs lua5.4) endif @@ -38,6 +39,7 @@ SOURCES += src/map_trie.c else SOURCES += src/map_dynarr.c CFLAGS += -DUSE_MAP_DYNARR +CXXFLAGS += -DUSE_MAP_DYNARR CFLAGS.w32 += -DUSE_MAP_DYNARR endif @@ -48,6 +50,8 @@ clean: $(TARGET): $(SOURCES) $(HEADERS) $(CC) $(CFLAGS) $(LDFLAGS) $(SOURCES) $(LDLIBS) -o $@ +$(TARGET)-cxx: $(SOURCES) $(HEADERS) + $(CXX) -x c++ $(CXXFLAGS) $(LDFLAGS) $(SOURCES) $(LDLIBS) -o $@ $(TARGET).exe: $(SOURCES) $(HEADERS) $(CC.w32) $(CFLAGS.w32) $(LDFLAGS.w32) $(SOURCES) $(LDLIBS.w32) -o $@ setpass: src/setpass.c src/passwd.c src/crypt_blowfish.c src/passwd.h src/netsock.h diff --git a/config.example.mk b/config.example.mk index ffb11da..66260b5 100644 --- a/config.example.mk +++ b/config.example.mk @@ -2,7 +2,9 @@ HEADERS+=config.mk CC=clang WARNS=-Wall -Wextra -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes #-Wmissing-variable-declarations +WARNSXX=-Wall -Wextra -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes CFLAGS=$(WARNS) -DHAS_TLS -DNETPOLL_USE_POLL -D_GNU_SOURCE +CXXFLAGS=$(WARNSXX) -DHAS_TLS -DNETPOLL_USE_POLL -D_GNU_SOURCE LDLIBS=-ltls CC.w32=i686-w64-mingw32-gcc CFLAGS.w32=$(WARNS) -DNETPOLL_USE_SELECT