ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

name change

This commit is contained in:
Flyinghead 2019-06-20 21:50:19 +02:00
parent b75a96592e
commit 9f66847469
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -45,8 +45,8 @@ script:
before_deploy:
- cd ../../
- mkdir -p artifacts/$GIT_BUILD/
- cp shell/android-studio/reicast/build/outputs/apk/dreamcast/debug/reicast-dreamcast-debug.apk artifacts/$GIT_BUILD/reicast-debug-$GIT_HASH.apk
- cp shell/android-studio/reicast/build/outputs/apk/naomi/debug/reicast-naomi-debug.apk artifacts/$GIT_BUILD/reicast-naomi-debug-$GIT_HASH.apk
- 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/reicast/build/outputs/apk/naomi/debug/reicast-naomi-debug.apk artifacts/$GIT_BUILD/flycast-naomi-debug-$GIT_HASH.apk
deploy:
provider: s3
access_key_id: AKIAJOZQS4H2PHQWYFCA
@ -59,5 +59,5 @@ deploy:
skip_cleanup: true
on:
all_branches: true
repo: flyinghead/reicast-emulator
repo: flyinghead/flycast

6
appveyor.yml
View File

@ -34,13 +34,13 @@ after_build:
mkdir artifacts
move %EXE_PATH% artifacts\reicast-win_%PLATFORM%-%CONFIGURATION%-%APPVEYOR_REPO_COMMIT%.exe
move %EXE_PATH% artifacts\flycast-win_%PLATFORM%-%CONFIGURATION%-%APPVEYOR_REPO_COMMIT%.exe
copy %EXTRA_PATH%\libgcc_s_seh-1.dll artifacts && copy %EXTRA_PATH%\libwinpthread-1.dll artifacts && copy %EXTRA_PATH%\libgomp-1.dll artifacts
artifacts:
- path: artifacts
name: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT)
name: flycast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT)
deploy:
- provider: S3
access_key_id: AKIAJOZQS4H2PHQWYFCA
@ -48,6 +48,6 @@ deploy:
secure: Y/QobuGrBsa137sbi9a+UnvSLqpWITTCp5yFTgDJ4i1Gduyi9V7i/g3zLZ4s2J7d
bucket: flycast-builds
folder: 'win/heads/$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)'
artifact: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT)
artifact: flycast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT)
region: us-east-2
set_public: true

4
core/rend/gui.cpp
View File

@ -309,7 +309,7 @@ static void gui_display_commands()
ImGui::SetNextWindowPos(ImVec2(screen_width / 2.f, screen_height / 2.f), ImGuiCond_Always, ImVec2(0.5f, 0.5f));
ImGui::SetNextWindowSize(ImVec2(330 * scaling, 0));
ImGui::Begin("Reicast", NULL, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize);
ImGui::Begin("Flycast", NULL, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize);
ImGui::Columns(2, "buttons", false);
if (ImGui::Button("Load State", ImVec2(150 * scaling, 50 * scaling)))
@ -1249,7 +1249,7 @@ static void gui_display_settings()
if (ImGui::BeginTabItem("About"))
{
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, normal_padding);
if (ImGui::CollapsingHeader("Reicast", ImGuiTreeNodeFlags_DefaultOpen))
if (ImGui::CollapsingHeader("Flycast", ImGuiTreeNodeFlags_DefaultOpen))
{
ImGui::Text("Version: %s", REICAST_VERSION);
ImGui::Text("Git Hash: %s", GIT_HASH);

6
shell/android-studio/reicast/build.gradle
View File

@ -29,7 +29,7 @@ android {
buildToolsVersion "27.0.3"
defaultConfig {
applicationId "com.reicast.emulator"
applicationId "com.flycast.emulator"
minSdkVersion 16
targetSdkVersion 26
versionCode getBuildId()
@ -72,7 +72,7 @@ android {
dreamcast {
}
naomi {
applicationId = "com.reicast.emulator.naomi"
applicationId = "com.flycast.emulator.naomi"
versionNameSuffix " Naomi"
externalNativeBuild { ndkBuild { arguments "NAOMI=1" } }
}
@ -93,7 +93,7 @@ afterEvaluate {
android.applicationVariants.all { v ->
if (v.buildType.name == "release") {
def hashtag = getVersionHash()
v.outputs[0].outputFileName = "reicast-android-" + hashtag + ".apk"
v.outputs[0].outputFileName = "flycast-android-" + hashtag + ".apk"
}
}
}

4
shell/android-studio/reicast/src/main/java/com/reicast/emulator/BaseGLActivity.java
View File

@ -70,7 +70,7 @@ public abstract class BaseGLActivity extends Activity implements ActivityCompat.
AlertDialog.Builder dlgAlert = new AlertDialog.Builder(this);
dlgAlert.setMessage("Initialization failed. Please try again and/or reinstall.\n\n"
+ "Error: " + result);
dlgAlert.setTitle("Reicast Error");
dlgAlert.setTitle("Flycast Error");
dlgAlert.setPositiveButton("Exit",
new DialogInterface.OnClickListener() {
@Override
@ -305,7 +305,7 @@ public abstract class BaseGLActivity extends Activity implements ActivityCompat.
AlertDialog.Builder dlgAlert = new AlertDialog.Builder(this);
dlgAlert.setMessage("An error occurred retrieving the log file:\n\n"
+ e.getMessage());
dlgAlert.setTitle("Reicast Error");
dlgAlert.setTitle("Flycast Error");
dlgAlert.setPositiveButton("Ok",
new DialogInterface.OnClickListener() {
@Override

2
shell/android-studio/reicast/src/main/res/values/donottranslate.xml
View File

@ -1,6 +1,6 @@
<resources>
<string name="app_name" translatable="false">reicast</string>
<string name="app_name" translatable="false">Flycast</string>
<string name="app_site" translatable="false">reicast.com</string>

2
shell/android-studio/reicast/src/naomi/res/values/donottranslate.xml
View File

@ -1,6 +1,6 @@
<resources>
<string name="app_name" translatable="false">reicast Naomi</string>
<string name="app_name" translatable="false">Flycast Naomi</string>
<string name="flavor" translatable="false">naomi</string>
<string-array name="images">

16
wercker.yml
View File

@ -9,28 +9,28 @@ build:
name: gcc-version
code: gcc --version
- script:
name: reicast x64 build
name: flycast x64 build
code: make -C shell/linux platform=x64
- script:
name: package app
code: |
mkdir s3
pushd shell/linux
mv -f nosym-reicast.elf reicast
gzip reicast
mv -f nosym-reicast.elf flycast
gzip flycast
popd
mv shell/linux/reicast.gz s3
mv shell/linux/flycast.gz s3
- script:
name: reicast x64 naomi build
name: flycast x64 naomi build
code: make -C shell/linux platform=x64 NAOMI=1
- script:
name: package naomi app
code: |
pushd shell/linux
mv -f nosym-reicast.elf reicast_naomi
gzip reicast_naomi
mv -f nosym-reicast.elf flycast_naomi
gzip flycast_naomi
popd
mv shell/linux/reicast_naomi.gz s3
mv shell/linux/flycast_naomi.gz s3
- s3sync:
source_dir: s3
delete-removed: false