X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=ba2e9b0aff3e8e219823cb42724bd92f2c2cdb84;hb=7343cc1f7e4f83384fa175cb6c321cdaaea05265;hp=8f7d036c4dfb2224c0d617d64495ac788ab427c9;hpb=636baaba0f52b37be2c84926942b751150ba21ab;p=xonotic%2Fnetradiant.git diff --git a/Makefile b/Makefile index 8f7d036c..ba2e9b0a 100644 --- a/Makefile +++ b/Makefile @@ -178,7 +178,7 @@ else ifeq ($(OS),Win32) CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline CFLAGS_COMMON += -mms-bitfields - LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias + LDFLAGS_DLL = -Wl,--add-stdcall-alias LIBS_COMMON = -lws2_32 -luser32 -lgdi32 -lole32 EXE ?= exe A = a @@ -447,10 +447,10 @@ ifeq ($(OS),Win32) $(WINDRES) $< $@ endif -%.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) +%.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check $(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ -%.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) +%.o: %.c dependencies-check $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@