thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'next' into camera-fix

Browse source
This commit is contained in:
Alam Ed Arias 2016-03-25 18:45:57 -04:00
commit 169210138d
9 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -10,6 +10,8 @@ compiler:
- clang - clang
cache: cache:
apt: true
ccache: true
directories: directories:
- $HOME/srb2_cache - $HOME/srb2_cache

8
cmake/Modules/FindGME.cmake
View file

@ -6,16 +6,16 @@ find_path(GME_INCLUDE_DIR
NAMES gme.h NAMES gme.h
PATHS PATHS
${GME_PKGCONF_INCLUDE_DIRS} ${GME_PKGCONF_INCLUDE_DIRS}
/usr/include/gme "/usr/include/gme"
/usr/local/include/gme "/usr/local/include/gme"
) )
find_library(GME_LIBRARY find_library(GME_LIBRARY
NAMES gme NAMES gme
PATHS PATHS
${GME_PKGCONF_LIBRARY_DIRS} ${GME_PKGCONF_LIBRARY_DIRS}
/usr/lib "/usr/lib"
/usr/local/lib "/usr/local/lib"
) )
set(GME_PROCESS_INCLUDES GME_INCLUDE_DIR) set(GME_PROCESS_INCLUDES GME_INCLUDE_DIR)

18
comptime.bat
View file

@ -1,4 +1,4 @@
@ECHO OFF @echo off
set BRA=Unknown set BRA=Unknown
set REV=illegal set REV=illegal
@ -13,20 +13,20 @@ goto filwri
:gitrev :gitrev
set GIT=%2 set GIT=%2
if "%GIT%"=="" set GIT=git if "%GIT%"=="" set GIT=git
FOR /F "usebackq" %%s IN (`%GIT% rev-parse --abbrev-ref HEAD`) DO @SET BRA=%%s for /f "usebackq" %%s in (`%GIT% rev-parse --abbrev-ref HEAD`) do @set BRA=%%s
FOR /F "usebackq" %%s IN (`%GIT% rev-parse HEAD`) DO @SET REV=%%s for /f "usebackq" %%s in (`%GIT% rev-parse HEAD`) do @set REV=%%s
set REV=%REV:~0,8% set REV=%REV:~0,8%
goto filwri goto filwri
:svnrev :svnrev
set BRA=Subversion set BRA=Subversion
FOR /F "usebackq" %%s IN (`svnversion .`) DO @SET REV=%%s for /f "usebackq" %%s in (`svnversion .`) do @set REV=%%s
set REV=r%REV% set REV=r%REV%
goto filwri goto filwri
:filwri :filwri
ECHO // Do not edit! This file was autogenerated > %1\comptime.h echo // Do not edit! This file was autogenerated > %1\comptime.h
ECHO // by the %0 batch file >> %1\comptime.h echo // by the %0 batch file >> %1\comptime.h
ECHO // >> %1\comptime.h echo // >> %1\comptime.h
ECHO const char* compbranch = "%BRA%"; >> %1\comptime.h echo const char* compbranch = "%BRA%"; >> %1\comptime.h
ECHO const char* comprevision = "%REV%"; >> %1\comptime.h echo const char* comprevision = "%REV%"; >> %1\comptime.h

1
src/CMakeLists.txt
View file

@ -316,6 +316,7 @@ if(${SRB2_CONFIG_HAVE_GME})
find_package(GME) find_package(GME)
if(${GME_FOUND}) if(${GME_FOUND})
set(SRB2_HAVE_GME ON) set(SRB2_HAVE_GME ON)
add_definitions(-DHAVE_LIBGME)
else() else()
message(WARNING "You have specified that GME is available but it was not found.") message(WARNING "You have specified that GME is available but it was not found.")
endif() endif()

6
src/Makefile
View file

@ -262,9 +262,7 @@ else
OBJS+=$(OBJDIR)/hw3sound.o OBJS+=$(OBJDIR)/hw3sound.o
endif endif
ifndef NOVERSION
OPTS += -DCOMPVERSION OPTS += -DCOMPVERSION
endif
ifndef NONX86 ifndef NONX86
ifndef GCC29 ifndef GCC29
@ -551,15 +549,11 @@ cleandep:
$(REMOVE) comptime.h $(REMOVE) comptime.h
pre-build: pre-build:
ifdef NOVERSION
-@touch comptime.c
else
ifdef WINDOWSHELL ifdef WINDOWSHELL
-..\comptime.bat . -..\comptime.bat .
else else
-@../comptime.sh . -@../comptime.sh .
endif endif
endif
clean: clean:
$(REMOVE) *~ *.flc $(REMOVE) *~ *.flc

2
src/d_main.c
View file

@ -513,7 +513,6 @@ static void D_Display(void)
// ========================================================================= // =========================================================================
tic_t rendergametic; tic_t rendergametic;
boolean supdate;
void D_SRB2Loop(void) void D_SRB2Loop(void)
{ {
@ -604,7 +603,6 @@ void D_SRB2Loop(void)
// Update display, next frame, with current state. // Update display, next frame, with current state.
D_Display(); D_Display();
supdate = false;
if (moviemode) if (moviemode)
M_SaveFrame(); M_SaveFrame();

1
src/d_main.h
View file

@ -17,7 +17,6 @@
#include "d_event.h" #include "d_event.h"
#include "w_wad.h" // for MAX_WADFILES #include "w_wad.h" // for MAX_WADFILES
extern boolean supdate;
extern boolean advancedemo; extern boolean advancedemo;
// make sure not to write back the config until it's been correctly loaded // make sure not to write back the config until it's been correctly loaded

2
src/p_enemy.c
View file

@ -7223,7 +7223,7 @@ void A_ChangeAngleAbsolute(mobj_t *actor)
//const angle_t amin = FixedAngle(locvar1*FRACUNIT); //const angle_t amin = FixedAngle(locvar1*FRACUNIT);
//const angle_t amax = FixedAngle(locvar2*FRACUNIT); //const angle_t amax = FixedAngle(locvar2*FRACUNIT);
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
if (LUA_CallAction("A_ChangeAngelAbsolute", actor)) if (LUA_CallAction("A_ChangeAngleAbsolute", actor))
return; return;
#endif #endif

3
src/sdl/CMakeLists.txt
View file

@ -122,6 +122,7 @@ if(${SDL2_FOUND})
add_framework(SDL2 SRB2SDL2) add_framework(SDL2 SRB2SDL2)
add_framework(SDL2_mixer SRB2SDL2) add_framework(SDL2_mixer SRB2SDL2)
target_link_libraries(SRB2SDL2 PRIVATE target_link_libraries(SRB2SDL2 PRIVATE
${GME_LIBRARIES}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
@ -131,6 +132,7 @@ if(${SDL2_FOUND})
target_link_libraries(SRB2SDL2 PRIVATE target_link_libraries(SRB2SDL2 PRIVATE
${SDL2_LIBRARIES} ${SDL2_LIBRARIES}
${SDL2_MIXER_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
${GME_LIBRARIES}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
@ -198,6 +200,7 @@ if(${SDL2_FOUND})
target_include_directories(SRB2SDL2 PRIVATE target_include_directories(SRB2SDL2 PRIVATE
${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS}
${SDL2_MIXER_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIRS}
${GME_INCLUDE_DIRS}
${PNG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
${OPENGL_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIRS}