Merged upstream changes.

.gitignore

@@ -111,7 +111,7 @@ tramp
 CMakeFiles
 CMakeCache.txt
 CTestTestfile.cmake
-Makefile
+/Makefile
 cmake_*.cmake
 install_manifest.txt
 

CMakeLists.txt

@@ -4,16 +4,6 @@ if(POLICY CMP0048)
 endif()
 
 find_package(Git QUIET)
-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/third-party/pybind11/include)
-    message(STATUS "Submodules seem to be missing. Attempting to clone now.")
-    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init RESULT_VARIABLE SUCCESS)
-    if(SUCCESS EQUAL 0)
-        message(STATUS "Submodules cloned!")
-    else()
-        message(FATAL_ERROR "Failed to check out submodules. Aborting.")
-    endif()
-    unset(SUCCESS)
-endif()
 
 find_package(PythonInterp REQUIRED)
 
@@ -103,11 +93,6 @@ set(COREINFO)
 set(CORE_TARGETS)
 
 function(add_core PLATFORM CORE_NAME)
-    if(GIT_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/.git AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.git)
-        add_custom_target(${PLATFORM}-submodule
-            COMMAND ${GIT_EXECUTABLE} submodule update --init cores/${PLATFORM}
-            DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/.git/index")
-    endif()
     set(TARGET_NAME ${CORE_NAME}_libretro${CMAKE_SHARED_LIBRARY_SUFFIX})
     get_filename_component(TARGET_PATH "${PYLIB_DIRECTORY}/retro/cores/${TARGET_NAME}" ABSOLUTE)
     list(APPEND CORES "${TARGET_PATH}")
@@ -123,17 +108,11 @@ function(add_core PLATFORM CORE_NAME)
         set(MAKEFILE Makefile)
         set(SUBDIR libretro)
     else()
-        message(FATAL_ERROR "Could not find Makefile. Did you clone submodules?")
+        message(FATAL_ERROR "Could not find Makefile.")
     endif()
 
-    if(EXISTS ${CMAKE_SOURCE_DIR}/.git)
-        add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${CORE_NAME}-version"
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/.git/modules/${PLATFORM}/HEAD" "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${CORE_NAME}-version"
-            DEPENDS ${PLATFORM}-submodule)
-    else()
-        add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${CORE_NAME}-version"
-            COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${CORE_NAME}-version")
-    endif()
+    add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${CORE_NAME}-version"
+        COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_CURRENT_SOURCE_DIR}/retro/cores/${CORE_NAME}-version")
     if(WIN32)
         set(LIBRETRO_PLATFORM platform=win)
     endif()

cores/atari2600/.gitignore

@@ -0,0 +1,22 @@
+# Xcode
+*.DS_Store
+*/build/*
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+*.xcworkspace
+!OpenEmu.xcworkspace
+!default.xcworkspace
+xcuserdata
+profile
+*.moved-aside
+*.o
+*.bc
+*.js
+*.json
+.npmignore

cores/atari2600/.gitrepo

@@ -0,0 +1,12 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;
+[subrepo]
+	remote = https://github.com/libretro/stella-libretro.git
+	branch = b0b63615fc2c7a30470fc1ac31ffdc18fdf4518b
+	commit = b0b63615fc2c7a30470fc1ac31ffdc18fdf4518b
+	parent = 72f0e18a9feb16f0975c90ed50bc82e8ccad5907
+	method = rebase
+	cmdver = 0.4.0

cores/atari2600/.travis.yml

@@ -0,0 +1,35 @@
+language: generic
+os: linux
+dist: trusty
+sudo: required
+addons:
+  apt:
+    packages:
+      - g++-7
+    sources:
+      - ubuntu-toolchain-r-test
+env:
+  global:
+    - CORE=stella
+    - COMPILER_NAME=gcc CXX=g++-7 CC=gcc-7
+  matrix:
+    - PLATFORM=linux_x64
+    - PLATFORM=ngc
+    - PLATFORM=wii
+    - PLATFORM=wiiu
+before_script:
+  - pwd
+  - mkdir -p ~/bin
+  - ln -s /usr/bin/gcc-7 ~/bin/gcc
+  - ln -s /usr/bin/g++-7 ~/bin/g++
+  - ln -s /usr/bin/cpp-7 ~/bin/cpp
+  - export PATH=~/bin:$PATH
+  - ls -l ~/bin
+  - echo $PATH
+  - g++-7 --version
+  - g++ --version
+script:
+  - cd ~/
+  - git clone --depth=50 https://github.com/libretro/libretro-super
+  - cd libretro-super/travis
+  - ./build.sh