Merge pull request #8 from loathingKernel/travis

Add Travis CI support for Linux and OS X

.travis.yml

@@ -1,28 +1,29 @@
-os: linux
-
-dist: trusty
-
-language: c
-
-compiler:
-  - clang
-  - gcc
-  
-addons:
-  apt:
-    sources:
-      - ubuntu-sdk-team
-    packages:
-      - intltool
-      - libavformat-dev
-      - libavcodec-dev
-      - libavutil-dev
-      - libgtk-3-dev
-      - libsdl2-dev
-      - libxtst-dev
-      - libxml2-utils
-
-script:
-  - mkdir build && cd build
-  - cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib'
-  - make -j1
+matrix:
+  include:
+    - os: linux
+      language: c
+      sudo: required
+      compiler: gcc
+      services: docker
+      before_install:
+        - docker pull ubuntu:17.10
+      script:
+        - docker build -f Dockerfile.gcc .
+    - os: linux
+      language: c
+      sudo: required
+      compiler: clang
+      services: docker
+      before_install:
+        - docker pull ubuntu:17.10
+      script:
+        - docker build -f Dockerfile.clang .
+    - os: osx
+      osx_image: xcode7.3
+      before_install:
+        - curl -O -L https://www.libsdl.org/release/SDL2-2.0.8.dmg
+        - hdiutil attach SDL2-2.0.8.dmg
+        - sudo cp -a /Volumes/SDL2/SDL2.framework /Library/Frameworks/
+      language: objective-c
+      xcode_project: macosx/Pcsxr.xcodeproj
+      xcode_scheme: PCSXR

CMakeLists.txt

@@ -27,7 +27,8 @@ add_definitions(-DENABLE_NLS -DGETTEXT_PACKAGE="pcsxr")
 
 #WARNING! this is required for dynarec to work!
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie")
-if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+list(APPEND COMPILER_IDS "GNU" "Clang")
+if(CMAKE_C_COMPILER_ID IN_LIST COMPILER_IDS)
     CHECK_C_COMPILER_FLAG("-no-pie" NO_PIE_UPSTREAM)
     if(NO_PIE_UPSTREAM)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")

Dockerfile.clang

@@ -0,0 +1,12 @@
+FROM ubuntu:17.10
+
+RUN apt-get update -qq
+RUN apt-get install -qq -y libtool intltool clang automake autoconf cmake
+RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev
+
+RUN mkdir -p /src/build/
+WORKDIR /src/build/
+
+COPY . /src/
+RUN cmake .. -DCMAKE_C_COMPILER='clang' -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
+RUN make

Dockerfile.gcc

@@ -0,0 +1,12 @@
+FROM ubuntu:17.10
+
+RUN apt-get update -qq
+RUN apt-get install -qq -y libtool intltool gcc automake autoconf cmake
+RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev
+
+RUN mkdir -p /src/build/
+WORKDIR /src/build/
+
+COPY . /src/
+RUN cmake .. -DCMAKE_C_COMPILER='gcc' -DCMAKE_CXX_COMPILER='g++' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
+RUN make

gui/CMakeLists.txt

@@ -1,9 +1,8 @@
-message(STATUS "* Configuring gui")
+message(STATUS "* Configuring UI")
 
 include(GlibCompileResourcesSupport)
 
 #deps
-
 find_package(GLib REQUIRED)
 if(NOT GLib_FOUND)
     message(FATAL_ERROR "GLIB2 library not found")

gui/po/CMakeLists.txt

@@ -1,4 +1,4 @@
-message(STATUS "* Configuring langs")
+message(STATUS "* Configuring translations")
 include(Gettext)
 
 #find_package(LibArchive REQUIRED)

libpcsxcore/CMakeLists.txt

@@ -1,4 +1,4 @@
-message(STATUS "* Configuring core")
+message(STATUS "* Configuring Core")
 
 set(DYNAREC "auto" CACHE STRING "Build dynarec for arch.")
 set_property(CACHE DYNAREC PROPERTY STRINGS auto x86_64 x86 ppc no)

macosx/Source/PcsxrMemCardArray.m

@@ -16,11 +16,11 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
 {
 	// header
 	memmove(to + (dsti + 1) * 128, from + (srci + 1) * 128, 128);
-	SaveMcd(0, str, to, (dsti + 1) * 128, 128);
+	SaveMcd(str, to, (dsti + 1) * 128, 128);
 	
 	// data
 	memmove(to + (dsti + 1) * 1024 * 8, from + (srci+1) * 1024 * 8, 1024 * 8);
-	SaveMcd(0, str, to, (dsti + 1) * 1024 * 8, 1024 * 8);
+	SaveMcd(str, to, (dsti + 1) * 1024 * 8, 1024 * 8);
 }
 
 static inline char* BlankHeader()
@@ -56,11 +56,11 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 	// header
 	char *header = BlankHeader();
 	memcpy(to + (dsti + 1) * 128, header, 128);
-	SaveMcd(0, str, to, (dsti + 1) * 128, 128);
+	SaveMcd(str, to, (dsti + 1) * 128, 128);
 	
 	// data
 	memset(to + (dsti + 1) * 1024 * 8, 0, 1024 * 8);
-	SaveMcd(0, str, to, (dsti + 1) * 1024 * 8, 1024 * 8);
+	SaveMcd(str, to, (dsti + 1) * 1024 * 8, 1024 * 8);
 }
 
 @interface PcsxrMemCardArray ()
@@ -338,7 +338,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
 		for (unsigned char j = 0; j < 127; j++) xor ^= *ptr++;
 		*ptr = xor;
 		
-		SaveMcd(0, filename, data, i * 128, 128);
+		SaveMcd(filename, data, i * 128, 128);
 	}
 }