From 10e1aaaf856c40282d646d04c3b9d3c61cd91b26 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Jan 2016 12:08:08 -0500
Subject: [PATCH] appveyor: no need for DEPFLAGS
---
appveyor.yml | 1 -
src/Makefile | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index eb2db8b86..51411d45e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,7 +29,6 @@ install:
#- ps: (Get-Content [System.Environment]::ExpandEnvironmentVariables("%TMP%\%SDL2_MOVE%\lib\pkgconfig\sdl2.pc")) | ForEach-Object { $_ -replace "/usr/local/cross-tools/i686-w64-mingw32", [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%") } | Set-Content [System.Environment]::ExpandEnvironmentVariables("%MINGW_SDK%\lib\pkgconfig\sdl2.pc")
before_build:
-- set DEPFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
- set SDL_CFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -Dmain=SDL_main -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2
- set SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib -lmingw32 -lSDL2main -lSDL2 -mwindows -L%TMP%\%SDL2_MIXER_MOVE%\lib
- set Path=%MINGW_SDK%\bin;%Path%
diff --git a/src/Makefile b/src/Makefile
index 2c1de64d5..d4cc64a4b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -703,13 +703,13 @@ $(OBJDIR)/depend.dep:
@echo "Creating dependency file, depend.dep"
@echo > comptime.h
-$(MKDIR) $(OBJDIR)
- $(CC) $(DEPFLAGS) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
- $(CC) $(DEPFLAGS) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
+ $(CC) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
+ $(CC) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
ifndef NOHW
- $(CC) $(DEPFLAGS) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
+ $(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
endif
ifndef NO_LUA
- $(CC) $(DEPFLAGS) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
+ $(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
endif
@sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
$(REMOVE) $(OBJDIR)/depend.ped
--
GitLab