diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c6a3ce799db5690be895b5f73c71bbed698ae8a6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,33 @@
+language: c
+sudo: required
+dist: trusty
+
+env:
+- CFLAGS=-Wno-absolute-value -Werror
+
+compiler:
+ - gcc
+ - clang
+
+cache:
+ directories:
+ - $HOME/srb2_cache
+
+addons:
+ apt:
+ packages:
+ - libsdl2-mixer-dev
+ - libpng-dev
+ - libgl1-mesa-dev
+ - libgme-dev
+ - p7zip-full
+
+before_script:
+ - mkdir $HOME/srb2_cache
+ - wget http://rosenthalcastle.org/srb2/SRB2-v2114-Installer.exe -c -O $HOME/srb2_cache/SRB2-v2114-Installer.exe
+ - 7z x $HOME/srb2_cache/SRB2-v2114-Installer.exe -oassets
+ - mkdir build
+ - cd build
+ - cmake ..
+
+script: make
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fb5cb28fbd6eacb2459c848e91b2ba7ae86943b..59557ef42e233ee78f65bf5687b18cd625beeb3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,9 +80,6 @@ endif()
if(${CMAKE_SYSTEM} MATCHES "Darwin")
add_definitions(-DMACOSX)
- if(${CMAKE_C_COMPILER_ID} MATCHES "Clang")
- set(CLANG ON)
- endif()
endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6859e27c38414e61dc93ffdb166794fde3e7674f..d9e25dbb8c70956a635dc3ceaebe85f127e319b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -166,7 +166,7 @@ set(SRB2_CORE_GAME_SOURCES
p_tick.h
)
-if(NOT CLANG)
+if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
set(SRB2_CORE_SOURCES ${SRB2_CORE_SOURCES} string.c)
endif()
@@ -404,10 +404,14 @@ endif()
# Compatibility flag with later versions of GCC
# We should really fix our code to not need this
-if(NOT CLANG AND NOT MSVC)
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mno-ms-bitfields)
endif()
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value)
+endif()
+
add_definitions(-DCMAKECONFIG)
#add_library(SRB2Core STATIC
@@ -429,4 +433,4 @@ endif()
if(NOT ${SRB2_SDL2_AVAILABLE} AND NOT ${SRB2_WIN32_AVAILABLE})
message(FATAL_ERROR "There are no targets available to build an SRB2 executable. :(")
-endif()
\ No newline at end of file
+endif()
diff --git a/src/b_bot.c b/src/b_bot.c
index 5e62e58e6d38230f82b874fddd4cec5a9f8e0aff..3072b1d75785d2b2834760c166e08fb10f28e99f 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -49,7 +49,7 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
if (sonic->player->pflags & (PF_MACESPIN|PF_ITEMHANG))
{
cmd->forwardmove = sonic->player->cmd.forwardmove;
- cmd->angleturn = abs(tails->angle - sonic->angle)>>16;
+ cmd->angleturn = abs((tails->angle - sonic->angle))>>16;
if (sonic->angle < tails->angle)
cmd->angleturn = -cmd->angleturn;
} else if (dist > FixedMul(512*FRACUNIT, tails->scale))
diff --git a/src/f_finale.c b/src/f_finale.c
index f541995d49977d3e54cc229a657922006b0a3f81..466e208a50f6aab4b8b818cb421090b3059a39bb 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -603,7 +603,7 @@ static void F_IntroDrawScene(void)
if (finalecount-84 < 58) { // Pure Fat is driving up!
int ftime = (finalecount-84);
- x = (-189<<FRACBITS) + (FixedMul((6<<FRACBITS)+FRACUNIT/3, ftime<<FRACBITS) - FixedMul((6<<FRACBITS)+FRACUNIT/3, FixedDiv(FixedMul(ftime<<FRACBITS, ftime<<FRACBITS), 120<<FRACBITS)));
+ x = (-189*FRACUNIT) + (FixedMul((6<<FRACBITS)+FRACUNIT/3, ftime<<FRACBITS) - FixedMul((6<<FRACBITS)+FRACUNIT/3, FixedDiv(FixedMul(ftime<<FRACBITS, ftime<<FRACBITS), 120<<FRACBITS)));
y = (BASEVIDHEIGHT<<FRACBITS) - FixedMul(417<<FRACBITS, aspect);
// Draw the body
V_DrawSciencePatch(x, y, V_SNAPTOLEFT|V_SNAPTOBOTTOM, (patch = W_CachePatchName("PUREFAT1", PU_CACHE)), aspect);
diff --git a/src/info.c b/src/info.c
index fb30258c31b2ab85a813a3cc9d21d29df3bd58d3..79301aab286594037122ceb61eeace67d9774c64 100644
--- a/src/info.c
+++ b/src/info.c
@@ -4225,7 +4225,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MT_GOOP, // painchance
sfx_dmpain, // painsound
S_EGGMOBILE2_PAIN2, // meleestate
- MT_EGGMOBILE2_POGO, // missilestate
+ (statenum_t)MT_EGGMOBILE2_POGO, // missilestate
S_EGGMOBILE2_DIE1, // deathstate
S_EGGMOBILE2_FLEE1,// xdeathstate
sfx_cybdth, // deathsound
diff --git a/src/m_menu.c b/src/m_menu.c
index c7a9fcc162e138a1f97b7cad6faf2d1c9dda79db..1e7745535d6e3a219a2c0b6a46902f75e105db9a 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6071,7 +6071,7 @@ static void M_RoomMenu(INT32 choice)
for (i = 0; room_list[i].header.buffer[0]; i++)
{
- if(room_list[i].name != '\0')
+ if(*room_list[i].name != '\0')
{
MP_RoomMenu[i+1].text = room_list[i].name;
roomIds[i] = room_list[i].id;
diff --git a/src/m_misc.c b/src/m_misc.c
index 57b8c4585166904d7f5ae2e6adb418d79ed10625..21728792f6b1a4b93a47892edef85e507b598c4b 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -677,7 +677,7 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
else
snprintf(maptext, 8, "Unknown");
- if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->lvlttl)
+ if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->lvlttl[0] != '\0')
snprintf(lvlttltext, 48, "%s%s%s",
mapheaderinfo[gamemap-1]->lvlttl,
(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE) ? "" : " ZONE",
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 18a4ec5ff415be7bee7f5b828fca47ece86ac247..6ac4e89689e4b38da57da1dc5554c9f380fe5565 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -6352,7 +6352,7 @@ void A_Boss2PogoTarget(mobj_t *actor)
if (actor->info->missilestate) // spawn the pogo stick collision box
{
- mobj_t *pogo = P_SpawnMobj(actor->x, actor->y, actor->z - mobjinfo[actor->info->missilestate].height, actor->info->missilestate);
+ mobj_t *pogo = P_SpawnMobj(actor->x, actor->y, actor->z - mobjinfo[actor->info->missilestate].height, (mobjtype_t)actor->info->missilestate);
pogo->target = actor;
}
diff --git a/src/p_map.c b/src/p_map.c
index 62cbf7b77635b8604cd7ecf0ad7f01628e5c976f..1aa8bc391cac84a118de6f356cf581358920e110 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -2507,8 +2507,8 @@ isblocking:
climbangle += (ANGLE_90 * (whichside ? -1 : 1));
- if (((!slidemo->player->climbing && abs(slidemo->angle - ANGLE_90 - climbline) < ANGLE_45)
- || (slidemo->player->climbing == 1 && abs(slidemo->angle - climbline) < ANGLE_135))
+ if (((!slidemo->player->climbing && abs((slidemo->angle - ANGLE_90 - climbline)) < ANGLE_45)
+ || (slidemo->player->climbing == 1 && abs((slidemo->angle - climbline)) < ANGLE_135))
&& P_IsClimbingValid(slidemo->player, climbangle))
{
slidemo->angle = climbangle;
diff --git a/src/p_user.c b/src/p_user.c
index d527c29c9f1039c3a138ec050dea0d32e5e8cfa6..ce68e2d61665a1c382b2524f3d7d69d92e82fb5e 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -7899,9 +7899,9 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (player == &players[consoleplayer])
{
if (focusangle >= localangle)
- localangle += abs(focusangle - localangle)>>5;
+ localangle += abs((focusangle - localangle))>>5;
else
- localangle -= abs(focusangle - localangle)>>5;
+ localangle -= abs((focusangle - localangle))>>5;
}
}
else if (P_AnalogMove(player)) // Analog
diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt
index b3fa5390c50a748d60e87920073f46f5c28ff117..eb832797e482c0450dcea44c1929fa0bb763a90d 100644
--- a/src/sdl/CMakeLists.txt
+++ b/src/sdl/CMakeLists.txt
@@ -117,7 +117,7 @@ if(${SDL2_FOUND})
add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32 ${SRB2_SDL2_TOTAL_SOURCES})
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME ${SRB2_SDL2_EXE_NAME})
- if(CLANG)
+ if((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
add_framework(CoreFoundation SRB2SDL2)
add_framework(SDL2 SRB2SDL2)
add_framework(SDL2_mixer SRB2SDL2)
@@ -224,7 +224,7 @@ if(${SDL2_FOUND})
endif()
#### Installation ####
- if (CLANG)
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
install(TARGETS SRB2SDL2
BUNDLE DESTINATION .
)
@@ -265,7 +265,7 @@ if(${SDL2_FOUND})
# Mac bundle fixup
- if(CLANG)
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
install(CODE "
include(BundleUtilities)
fixup_bundle(\"${CMAKE_INSTALL_PREFIX}/Sonic Robo Blast 2.app\"
@@ -279,4 +279,4 @@ if(${SDL2_FOUND})
else()
message(WARNING "SDL2 was not found, so the SDL2 target will not be available.")
set(SRB2_SDL2_AVAILABLE NO PARENT_SCOPE)
-endif()
\ No newline at end of file
+endif()