reicast -> flycast
|
@ -27,5 +27,5 @@ jobs:
|
|||
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: reicast-dreamcast-debug.apk
|
||||
path: shell/android-studio/reicast/build/outputs/apk/dreamcast/debug/reicast-dreamcast-debug.apk
|
||||
name: flycast-debug.apk
|
||||
path: shell/android-studio/flycast/build/outputs/apk/dreamcast/debug/flycast-dreamcast-debug.apk
|
||||
|
|
|
@ -29,7 +29,7 @@ before_deploy:
|
|||
- GIT_HASH=`git log --pretty=format:'%h' -n 1`
|
||||
- GIT_BUILD=`git describe --all --always`-$GIT_HASH
|
||||
- mkdir -p artifacts/$GIT_BUILD/
|
||||
- cp shell/android-studio/reicast/build/outputs/apk/dreamcast/debug/reicast-dreamcast-debug.apk artifacts/$GIT_BUILD/flycast-debug-$GIT_HASH.apk
|
||||
- cp shell/android-studio/flycast/build/outputs/apk/dreamcast/debug/flycast-dreamcast-debug.apk artifacts/$GIT_BUILD/flycast-debug-$GIT_HASH.apk
|
||||
|
||||
deploy:
|
||||
provider: s3
|
||||
|
|
|
@ -934,8 +934,8 @@ if(ANDROID)
|
|||
target_compile_definitions(${PROJECT_NAME} PRIVATE GLES GLES3)
|
||||
|
||||
target_sources(${PROJECT_NAME} PRIVATE
|
||||
shell/android-studio/reicast/src/main/jni/src/Android.cpp
|
||||
shell/android-studio/reicast/src/main/jni/src/utils.cpp)
|
||||
shell/android-studio/flycast/src/main/jni/src/Android.cpp
|
||||
shell/android-studio/flycast/src/main/jni/src/utils.cpp)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE android EGL GLESv2 log)
|
||||
elseif(APPLE)
|
||||
|
@ -962,7 +962,7 @@ elseif(APPLE)
|
|||
MACOSX_BUNDLE_BUNDLE_NAME "Flycast"
|
||||
MACOSX_BUNDLE_SHORT_VERSION_STRING "1.0"
|
||||
MACOSX_BUNDLE_BUNDLE_VERSION "1"
|
||||
MACOSX_BUNDLE_COPYRIGHT "Copyright © 2019 reicast contributors. All rights reserved."
|
||||
MACOSX_BUNDLE_COPYRIGHT "Copyright © 2019 Flycast contributors. All rights reserved."
|
||||
XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "shell/apple/emulator-osx/emulator-osx/emulator-osx-Bridging-Header.h"
|
||||
RESOURCE "${XIB}"
|
||||
XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
|
||||
|
|
|
@ -27,7 +27,7 @@ build_script:
|
|||
|
||||
after_build:
|
||||
- cmd: >-
|
||||
if "%CONFIGURATION%"=="fast" (cd ..\.. && set EXE_PATH=shell\linux\nosym-reicast.exe)
|
||||
if "%CONFIGURATION%"=="fast" (cd ..\.. && set EXE_PATH=shell\linux\nosym-flycast.exe)
|
||||
|
||||
mkdir artifacts
|
||||
|
||||
|
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
@ -1 +1 @@
|
|||
include ':reicast'
|
||||
include ':flycast'
|
||||
|
|
|
@ -459,9 +459,9 @@ ifdef UNIT_TESTS
|
|||
TEST_SRC_DIR:=$(RZDCY_SRC_DIR)/../tests/src
|
||||
RZDCY_FILES += $(wildcard $(TEST_SRC_DIR)/*.cpp) $(RZDCY_SRC_DIR)/deps/gtest/src/gtest_main.cc $(RZDCY_SRC_DIR)/deps/gtest/src/gtest-all.cc
|
||||
else
|
||||
EXECUTABLE_STRIPPED=nosym-reicast.$(PLATFORM_EXT)
|
||||
EXECUTABLE_STRIPPED=nosym-flycast.$(PLATFORM_EXT)
|
||||
DC_PLATFORM=dreamcast
|
||||
EXECUTABLE=reicast.$(PLATFORM_EXT)
|
||||
EXECUTABLE=flycast.$(PLATFORM_EXT)
|
||||
EXECUTABLE_NAME=flycast
|
||||
endif
|
||||
|
||||
|
@ -554,27 +554,27 @@ $(BUILDDIR)/%.build_obj : $(RZDCY_SRC_DIR)/%.S $(VERSION_HEADER)
|
|||
|
||||
install: $(EXECUTABLE)
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || true
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/share/reicast/mappings 2>/dev/null || true
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/share/flycast/mappings 2>/dev/null || true
|
||||
mkdir -p $(DESTDIR)$(MAN_DIR) 2>/dev/null || true
|
||||
mkdir -p $(DESTDIR)$(MENUENTRY_DIR) 2>/dev/null || true
|
||||
mkdir -p $(DESTDIR)$(ICON_DIR) 2>/dev/null || true
|
||||
install -m755 $(EXECUTABLE) $(DESTDIR)$(PREFIX)/bin/$(EXECUTABLE_NAME)
|
||||
install -m644 mappings/controller_generic.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
|
||||
install -m644 mappings/controller_pandora.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
|
||||
install -m644 mappings/controller_xboxdrv.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
|
||||
install -m644 mappings/controller_xpad.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
|
||||
install -m644 mappings/keyboard.cfg $(DESTDIR)$(PREFIX)/share/reicast/mappings
|
||||
install -m644 mappings/controller_generic.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
|
||||
install -m644 mappings/controller_pandora.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
|
||||
install -m644 mappings/controller_xboxdrv.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
|
||||
install -m644 mappings/controller_xpad.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
|
||||
install -m644 mappings/keyboard.cfg $(DESTDIR)$(PREFIX)/share/flycast/mappings
|
||||
install -m644 man/flycast.1 $(DESTDIR)$(MAN_DIR)
|
||||
install -m644 flycast.desktop $(DESTDIR)$(MENUENTRY_DIR)
|
||||
install -m644 flycast.png $(DESTDIR)$(ICON_DIR)
|
||||
|
||||
uninstall:
|
||||
rm -f $(DESTDIR)$(PREFIX)/bin/$(EXECUTABLE_NAME)
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_generic.cfg
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_pandora.cfg
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_xboxdrv.cfg
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/controller_xpad.cfg
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/reicast/mappings/keyboard.cfg
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/controller_generic.cfg
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/controller_pandora.cfg
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/controller_xboxdrv.cfg
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/controller_xpad.cfg
|
||||
rm -f $(DESTDIR)$(PREFIX)/share/flycast/mappings/keyboard.cfg
|
||||
rm -f $(DESTDIR)$(MAN_DIR)/flycast.1
|
||||
rm -f $(DESTDIR)$(MENUENTRY_DIR)/flycast.desktop
|
||||
rm -f $(DESTDIR)$(ICON_DIR)/flycast.png
|
||||
|
|
|
@ -19,7 +19,7 @@ build:
|
|||
code: |
|
||||
mkdir s3
|
||||
pushd shell/linux
|
||||
mv -f nosym-reicast.elf flycast
|
||||
mv -f nosym-flycast.elf flycast
|
||||
gzip flycast
|
||||
popd
|
||||
mv shell/linux/flycast.gz s3
|
||||
|
|