stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

new flags: DEPFLAGS, to tell the depend step where are the headers

Browse source
This commit is contained in:
Alam Ed Arias 2016-01-28 11:41:02 -05:00
parent 4230225a0c
commit 7a09a82489
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -29,7 +29,7 @@ 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") #- 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: before_build:
- set CPPFLAGS=-I%TMP%\%SDL2_MOVE%\include\SDL2 -I%TMP%\%SDL2_MIXER_MOVE%\include\SDL2 - 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_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 SDL_LDFLAGS=-L%TMP%\%SDL2_MOVE%\lib -lmingw32 -lSDL2main -lSDL2 -mwindows -L%TMP%\%SDL2_MIXER_MOVE%\lib
- set Path=%MINGW_SDK%\bin;%Path% - set Path=%MINGW_SDK%\bin;%Path%

8
src/Makefile
View file

@ -703,13 +703,13 @@ $(OBJDIR)/depend.dep:
@echo "Creating dependency file, depend.dep" @echo "Creating dependency file, depend.dep"
@echo > comptime.h @echo > comptime.h
-$(MKDIR) $(OBJDIR) -$(MKDIR) $(OBJDIR)
$(CC) $(CPPFLAGS) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped $(CC) $(DEPFLAGS) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
$(CC) $(CPPFLAGS) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped $(CC) $(DEPFLAGS) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
ifndef NOHW ifndef NOHW
$(CC) $(CPPFLAGS) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped $(CC) $(DEPFLAGS) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
endif endif
ifndef NO_LUA ifndef NO_LUA
$(CC) $(CPPFLAGS) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped $(CC) $(DEPFLAGS) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
endif endif
@sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep @sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
$(REMOVE) $(OBJDIR)/depend.ped $(REMOVE) $(OBJDIR)/depend.ped