Merge pull request iCatButler#7 from loathingKernel/sync-with-codeplex

Sync with codeplex
Poplavoc · Mar 19, 2018 · 6f76041 · 6f76041
2 parents 7683324 + 128d6af
commit 6f76041
Show file tree

Hide file tree

Showing 119 changed files with 27,764 additions and 26,330 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -0,0 +1,20 @@
+version: 1.9.95.{branch}.{build}
+
+pull_requests:
+  do_not_increment_build_number: true
+
+configuration:
+  - Debug
+  - Release
+
+build:
+  project: win32/pcsxr.sln
+  verbosity: minimal
+
+after_build:
+  - cd win32\build\%CONFIGURATION%
+  - 7z a pcsxr-pgxp.zip pcsxr-pgxp.exe
+  - 7z a pcsxr-pgxp.zip plugins\*.dll
+
+artifacts:
+  - path: win32\build\%CONFIGURATION%\pcsxr-pgxp.zip
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,14 @@
+* text=auto
+*.h text=auto
+*.c text=auto
+*.cpp text=auto
+*.m text=lf
+*.swift text=lf
+*.rc text=crlf
+
+*.pdf binary
+*.gif binary
+*.jpg binary
+*.png binary
+*.bmp binary
+*.ico binary
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,5 @@ linux_build.sh
 project.xcworkspace
 .DS_Store
 build/
+*.suo
+*.VC.db
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,28 @@
+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
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,55 @@
+cmake_minimum_required(VERSION 3.4.0)
+cmake_policy(SET CMP0065 NEW)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/macros)
+
+set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build")
+set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel)
+
+project(pcsxr)
+
+set(PCSXR_VERSION_MAJOR "1")
+set(PCSXR_VERSION_MINOR "9")
+set(PCSXR_VERSION_PATCH "94")
+add_definitions(-DPACKAGE_VERSION="${PCSXR_VERSION_MAJOR}.${PCSXR_VERSION_MINOR}.${PCSXR_VERSION_PATCH}")
+add_definitions(-DPACKAGE_NAME="PCSXr")
+add_definitions(-DPACKAGE_STRING="PCSXr ${PCSXR_VERSION_MAJOR}.${PCSXR_VERSION_MINOR}.${PCSXR_VERSION_PATCH}")
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+
+include(CheckCCompilerFlag)
+include(GNUInstallDirs)
+
+include_directories(${CMAKE_SOURCE_DIR})
+
+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)
+    CHECK_C_COMPILER_FLAG("-no-pie" NO_PIE_UPSTREAM)
+    if(NO_PIE_UPSTREAM)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
+    endif()
+    CHECK_C_COMPILER_FLAG("-nopie" NO_PIE_PATCHED)
+    if(NO_PIE_PATCHED)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nopie")
+    endif()
+endif()
+
+option(BUILD_SIO1 "Build SIO1 plugin." ON)
+option(BUILD_OPENGL "Build OpenGL plugin." ON)
+
+if (BUILD_SIO1)
+  add_definitions(-DENABLE_SIO1API)
+endif()
+
+#components
+add_subdirectory(libpcsxcore)
+add_subdirectory(gui)
+add_subdirectory(plugins)
+add_subdirectory(doc)
+
+
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,3 +11,5 @@ linux_build.sh @@
     project.xcworkspace
     .DS_Store
     build/
+    *.suo
+    *.VC.db