From bc8f8be222287fec977ec3f47a5cb065cceb2ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Drahos=CC=8C?= Date: Mon, 18 Feb 2013 16:36:40 +0100 Subject: [PATCH 1/3] Updated travis hook --- .travis.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43f8453..57493eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,8 @@ language: C # Try using multiple Lua Implementations env: - - TOOL="" # Use native compiler (GCC usually) - - COMPILER="clang" # Use clang -# - COMPILER="fortran" # Use fortran, make sure to modify the matrix section + - TOOL="gcc" # Use native compiler (GCC usually) + - TOOL="clang" # Use clang - TOOL="i686-w64-mingw32" # 32bit MinGW - TOOL="x86_64-w64-mingw32" # 64bit MinGW - TOOL="arm-linux-gnueabihf" # ARM hard-float (hf), linux @@ -20,23 +19,23 @@ matrix: - env: TOOL="i686-w64-mingw32" - env: TOOL="x86_64-w64-mingw32" - env: TOOL="arm-linux-gnueabihf" - + # Install dependencies install: - - git clone git://github.com/LuaDist/_util.git ~/_util - - ~/_util/travis install + - git clone git://github.com/LuaDist/Tools.git ~/_tools + - ~/_tools/travis/travis install # Bootstap before_script: - - ~/_util/travis bootstrap + - ~/_tools/travis/travis bootstrap # Build the module script: - - ~/_util/travis build + - ~/_tools/travis/travis build # Execute additional tests or commands -#after_script: -# - ~/_util/travis test +after_script: + - ~/_tools/travis/travis test # Only watch the master branch branches: From 41a52cc87d129a3ab1e05c5022dabbb47ac139dd Mon Sep 17 00:00:00 2001 From: "U-REALD\\hflynn" Date: Thu, 25 Jun 2015 16:42:57 +0100 Subject: [PATCH 2/3] Build static library for WIN32 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 743f3fa..19e3847 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,11 @@ set ( SRC jmemnobs.c jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolo jidctflt.c jidctfst.c jidctint.c jquant1.c jquant2.c jutils.c jmemmgr.c cderror.h cdjpeg.h jdct.h jinclude.h jmemsys.h jpegint.h jversion.h transupp.h ) -add_library ( jpeg ${SRC} ${HEADERS} ) +if ( WIN32 ) + add_library ( jpeg STATIC ${SRC} ${HEADERS} ) +else + add_library ( jpeg ${SRC} ${HEADERS} ) +endif ( ) add_executable ( cjpeg cdjpeg.c cjpeg.c rdbmp.c rdgif.c rdppm.c rdrle.c rdtarga.c rdswitch.c ) From d8f214d61d81b9f5ca0056adba576e108da4182b Mon Sep 17 00:00:00 2001 From: "U-REALD\\hflynn" Date: Tue, 30 Jun 2015 15:56:29 +0100 Subject: [PATCH 3/3] fixed syntax error --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19e3847..b5247bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,9 +33,9 @@ set ( SRC jmemnobs.c jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolo if ( WIN32 ) add_library ( jpeg STATIC ${SRC} ${HEADERS} ) -else +else ( WIN32 ) add_library ( jpeg ${SRC} ${HEADERS} ) -endif ( ) +endif ( WIN32 ) add_executable ( cjpeg cdjpeg.c cjpeg.c rdbmp.c rdgif.c rdppm.c rdrle.c rdtarga.c rdswitch.c )