X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=ecb5fb6ce27bd911ffa627da328f0029a98142d5;hb=c75ae4296b59dbdc836355dcf8478bc097b32ebd;hp=b0a1d4a27f13939635580c63a1b06c4ba21f821f;hpb=0a4e4f3786f3bf41fa8cdc67bc8e46b4c68c2037;p=xonotic%2Fnetradiant.git diff --git a/Makefile b/Makefile index b0a1d4a2..ecb5fb6c 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,7 @@ ifeq ($(OS),Win32) CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline CFLAGS_COMMON += -mms-bitfields LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias - LIBS_COMMON = -lws2_32 -luser32 -lgdi32 + LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32 EXE ?= exe A = a DLL = dll @@ -506,6 +506,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \ tools/quake3/q3map2/vis.o \ tools/quake3/q3map2/writebsp.o \ libddslib.$(A) \ + libfilematch.$(A) \ libjpeg6.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ @@ -693,6 +694,7 @@ $(INSTALLDIR)/radiant.$(EXE): \ radiant/xmlstuff.o \ radiant/xywindow.o \ libcmdlib.$(A) \ + libfilematch.$(A) \ libgtkutil.$(A) \ libl_net.$(A) \ libmathlib.$(A) \ @@ -700,6 +702,10 @@ $(INSTALLDIR)/radiant.$(EXE): \ libxmllib.$(A) \ $(if $(findstring $(OS),Win32),icons/radiant.o,) \ +libfilematch.$(A): CPPFLAGS_EXTRA := -Ilibs +libfilematch.$(A): \ + libs/filematch.o \ + libcmdlib.$(A): CPPFLAGS_EXTRA := -Ilibs libcmdlib.$(A): \ libs/cmdlib/cmdlib.o \