Fix several build-tool bugs, cleanup Windows compilation and remove warning messages.

master
Webster Sheets 2019-05-27 12:19:07 -04:00
parent bca06f46b9
commit 255df01868
5 changed files with 30 additions and 8 deletions

View File

@ -27,15 +27,20 @@ addons:
- sdl2
- sdl2_image
- libogg
matrix:
include:
# OSX is faster to boot and execute the checks, but has more contention for VM instances.
# Not waiting fifteen minutes for an instance to come available is faster.
- name: Static Checks
os: osx # OSX is twice as fast to complete the checks
os: linux
env: STATIC_CHECKS=yes
deploy: false
before_install: skip
addons:
homebrew:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- clang-format
script: bash ./scripts/clang-format.sh

View File

@ -1,6 +1,9 @@
#!/bin/bash
CLANG_FORMAT="clang-format"
CLANG_FORMAT=`which "clang-format"`
if [ ! $PATCH_MODE ]; then
echo "clang-format = $CLANG_FORMAT"
fi
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
# Check the whole commit range against $TRAVIS_BRANCH, the base merge branch

View File

@ -3,9 +3,16 @@
#include <cstring>
#include <string>
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wattributes"
#endif
extern "C" {
#include "miniz/miniz.h"
#include <miniz/miniz.h>
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
namespace {
enum GZipFlags {

View File

@ -51,7 +51,7 @@ struct LuaFlags {
lua_pushinteger(l, lookupTableRef);
lua_gettable(l, LUA_REGISTRYINDEX);
uint table_idx = 1;
int table_idx = 1;
while (true) {
lua_pushinteger(l, table_idx++);
lua_gettable(l, index);

View File

@ -6,14 +6,21 @@
#include "NodeVisitor.h"
#include "Parser.h"
#include "StringF.h"
#include "utils.h"
#include "scenegraph/Animation.h"
#include "scenegraph/MatrixTransform.h"
#include "scenegraph/Label3D.h"
#include "scenegraph/MatrixTransform.h"
#include "utils.h"
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wattributes"
#endif
extern "C" {
#include "miniz/miniz.h"
#include <miniz/miniz.h>
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
using namespace SceneGraph;