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

Merge remote-tracking branch 'origin/master' into fh/wince-dynarec

This commit is contained in:
Flyinghead 2019-06-21 14:37:32 +02:00
parent 5b2ad02fa2 aa36a65d13
commit b226544d03
26 changed files with 74 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -45,7 +45,7 @@ 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/dreamcast/debug/reicast-dreamcast-debug.apk artifacts/$GIT_BUILD/flycast-debug-$GIT_HASH.apk
deploy:
provider: s3
access_key_id: AKIAJOZQS4H2PHQWYFCA
@ -58,5 +58,5 @@ deploy:
skip_cleanup: true
on:
all_branches: true
repo: flyinghead/reicast-emulator
repo: flyinghead/flycast

6
appveyor.yml
View File

@ -33,13 +33,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
@ -47,6 +47,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

2
core/deps/imgui/imconfig.h
View File

@ -75,7 +75,7 @@ namespace ImGui
#ifdef _ANDROID
#include <android/log.h>
#define LOG_TAG "reicast"
#define LOG_TAG "flycast"
#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
#endif

2
core/deps/vixl/platform-vixl.h
View File

@ -46,7 +46,7 @@ extern "C" {
#undef puts
#endif
#define LOG_TAG "reicast"
#define LOG_TAG "flycast"
#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
#define LOGW(...) __android_log_print(ANDROID_LOG_WARN,LOG_TAG,__VA_ARGS__)
#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)

12
core/hw/pvr/ta_ctx.cpp
View File

@ -198,13 +198,15 @@ bool rend_framePending() {
void FinishRender(TA_context* ctx)
{
verify(ctx == NULL || rqueue == ctx);
mtx_rqueue.Lock();
rqueue = 0;
mtx_rqueue.Unlock();
if (ctx != NULL)
{
verify(rqueue == ctx);
mtx_rqueue.Lock();
rqueue = NULL;
mtx_rqueue.Unlock();
tactx_Recycle(ctx);
}
frame_finished.Set();
}

6
core/linux-dist/x11.cpp
View File

@ -172,7 +172,7 @@ static void destroy_empty_cursor()
static void x11_capture_mouse()
{
x11_window_set_text("Reicast - mouse capture");
x11_window_set_text("Flycast - mouse capture");
capturing_mouse = true;
Cursor cursor = create_empty_cursor();
Display *display = (Display*)x11_disp;
@ -185,7 +185,7 @@ static void x11_capture_mouse()
static void x11_uncapture_mouse()
{
x11_window_set_text("Reicast");
x11_window_set_text("Flycast");
capturing_mouse = false;
Display *display = (Display*)x11_disp;
Window window = (Window)x11_win;
@ -551,7 +551,7 @@ void x11_window_create()
x11_win = (void*)x11Window;
x11_vis = (void*)x11Visual->visual;
x11_window_set_text("Reicast");
x11_window_set_text("Flycast");
}
else
{

4
core/rend/gui.cpp
View File

@ -308,7 +308,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)))
@ -1247,7 +1247,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);

2
core/sdl/sdl.cpp
View File

@ -247,7 +247,7 @@ void sdl_window_create()
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
window = SDL_CreateWindow("Reicast Emulator", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, window_width, window_height, flags);
window = SDL_CreateWindow("Flycast", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, window_width, window_height, flags);
if (!window)
{
die("error creating SDL window");

10
core/types.h
View File

@ -404,13 +404,13 @@ using namespace std;
#if DC_PLATFORM==DC_PLATFORM_DREAMCAST
#define VER_EMUNAME "reicast"
#define VER_EMUNAME "Flycast"
#elif DC_PLATFORM==DC_PLATFORM_DEV_UNIT
#define VER_EMUNAME "reicast-DevKit-SET5.21"
#define VER_EMUNAME "Flycast-DevKit-SET5.21"
#elif DC_PLATFORM==DC_PLATFORM_NAOMI
#define VER_EMUNAME "reicast-Naomi"
#define VER_EMUNAME "Flycast-Naomi"
#elif DC_PLATFORM==DC_PLATFORM_ATOMISWAVE
#define VER_EMUNAME "reicast-AtomisWave"
#define VER_EMUNAME "Flycast-AtomisWave"
#else
#error unknown target platform
#endif
@ -775,7 +775,7 @@ static inline void do_nada(...) { }
#undef puts
#endif
#define LOG_TAG "reicast"
#define LOG_TAG "flycast"
#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
#define LOGW(...) __android_log_print(ANDROID_LOG_WARN,LOG_TAG,__VA_ARGS__)
#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)

2
core/windows/winmain.cpp
View File

@ -719,7 +719,7 @@ int CALLBACK WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpCmdLine
i++;
}
else
logfile = "reicast-log.txt";
logfile = "flycast-log.txt";
freopen(logfile, "w", stdout);
freopen(logfile, "w", stderr);
}

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"
}
}
}

6
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
@ -125,7 +125,7 @@ public abstract class BaseGLActivity extends Activity implements ActivityCompat.
List<String> pathList = new ArrayList<>();
pathList.add(android_home_directory);
pathList.addAll(FileBrowser.getExternalMounts());
Log.i("reicast", "External storage dirs: " + pathList);
Log.i("flycast", "External storage dirs: " + pathList);
JNIdc.setExternalStorageDirectories(pathList.toArray());
}
@ -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/java/com/reicast/emulator/Emulator.java
View File

@ -51,7 +51,7 @@ public class Emulator extends Application {
*/
public void SaveAndroidSettings(String homeDirectory)
{
Log.i("reicast", "SaveAndroidSettings: saving preferences");
Log.i("flycast", "SaveAndroidSettings: saving preferences");
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
Emulator.nosound = JNIdc.getNosound();
Emulator.vibrationDuration = JNIdc.getVirtualGamepadVibration();

2
shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/Config.java
View File

@ -8,5 +8,5 @@ public class Config {
public static final String pref_rendertype = "render_type";
public static final String pref_renderdepth = "depth_render";
public static String git_issues = "https://github.com/reicast/reicast-emulator/issues/";
public static String git_issues = "https://github.com/flyinghead/flycast/issues/";
}

8
shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/NativeGLView.java
View File

@ -90,7 +90,7 @@ public class NativeGLView extends SurfaceView implements SurfaceHolder.Callback
@Override
public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int w, int h) {
//Log.i("reicast", "NativeGLView.surfaceChanged: " + w + "x" + h);
//Log.i("flycast", "NativeGLView.surfaceChanged: " + w + "x" + h);
surfaceReady = true;
JNIdc.rendinitNative(surfaceHolder.getSurface());
Emulator.getCurrentActivity().handleStateChange(false);
@ -98,7 +98,7 @@ public class NativeGLView extends SurfaceView implements SurfaceHolder.Callback
@Override
public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
//Log.i("reicast", "NativeGLView.surfaceDestroyed");
//Log.i("flycast", "NativeGLView.surfaceDestroyed");
surfaceReady = false;
JNIdc.rendinitNative(null);
Emulator.getCurrentActivity().handleStateChange(true);
@ -111,12 +111,12 @@ public class NativeGLView extends SurfaceView implements SurfaceHolder.Callback
public void pause() {
paused = true;
JNIdc.pause();
//Log.i("reicast", "NativeGLView.pause");
//Log.i("flycast", "NativeGLView.pause");
}
public void resume() {
if (paused) {
//Log.i("reicast", "NativeGLView.resume");
//Log.i("flycast", "NativeGLView.resume");
paused = false;
setFocusable(true);
setFocusableInTouchMode(true);

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">

14
shell/apple/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib
View File

@ -21,11 +21,11 @@
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
<menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="Reicast" id="1Xt-HY-uBw">
<menuItem title="Flycast" id="1Xt-HY-uBw">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Reicast" systemMenu="apple" id="uQy-DD-JDr">
<menu key="submenu" title="Flycast" systemMenu="apple" id="uQy-DD-JDr">
<items>
<menuItem title="About Reicast" id="5kV-Vb-QxS">
<menuItem title="About Flycast" id="5kV-Vb-QxS">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
@ -39,7 +39,7 @@
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
</menuItem>
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
<menuItem title="Hide Reicast" keyEquivalent="h" id="Olw-nP-bQN">
<menuItem title="Hide Flycast" keyEquivalent="h" id="Olw-nP-bQN">
<connections>
<action selector="hide:" target="-1" id="PnN-Uc-m68"/>
</connections>
@ -158,7 +158,7 @@
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
<items>
<menuItem title="Reicast Help" keyEquivalent="?" id="FKE-Sm-Kum">
<menuItem title="Flycast Help" keyEquivalent="?" id="FKE-Sm-Kum">
<connections>
<action selector="showHelp:" target="-1" id="y7X-2Q-9no"/>
</connections>
@ -168,11 +168,11 @@
</menuItem>
</items>
</menu>
<window title="Reicast" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
<window title="Flycast" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="335" y="390" width="960" height="720"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<view key="contentView" id="EiT-Mj-1SZ" customClass="EmuGLView" customModule="Reicast" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="960" height="720"/>
<autoresizingMask key="autoresizingMask"/>

4
shell/apple/emulator-osx/emulator-osx/DreamcastConfig.xcconfig
View File

@ -4,8 +4,8 @@
//
// Created by flyinghead on 21/05/2019.
//
REI_APP_NAME = Reicast
PRODUCT_NAME = Reicast
REI_APP_NAME = Flycast
PRODUCT_NAME = Flycast
CFLAGS =

2
shell/apple/emulator-osx/emulator-osx/Info.plist
View File

@ -27,7 +27,7 @@
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 reicast. All rights reserved.</string>
<string>Copyright © 2019 reicast contributors. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>

4
shell/apple/emulator-osx/emulator-osx/NaomiConfig.xcconfig
View File

@ -4,7 +4,7 @@
//
// Created by flyinghead on 21/05/2019.
//
REI_APP_NAME = Reicast Naomi
PRODUCT_NAME = Reicast Naomi
REI_APP_NAME = Flycast Naomi
PRODUCT_NAME = Flycast Naomi
CFLAGS = DC_PLATFORM=2

8
shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
View File

@ -332,7 +332,7 @@
84967CBA1B8F49EE005F1140 /* pngwrite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pngwrite.c; sourceTree = "<group>"; };
84967CBB1B8F49EE005F1140 /* pngwtran.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pngwtran.c; sourceTree = "<group>"; };
84967CBC1B8F49EE005F1140 /* pngwutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pngwutil.c; sourceTree = "<group>"; };
84A388B31B1CDD3E000166C0 /* Reicast.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Reicast.app; sourceTree = BUILT_PRODUCTS_DIR; };
84A388B31B1CDD3E000166C0 /* Flycast.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Flycast.app; sourceTree = BUILT_PRODUCTS_DIR; };
84A388B71B1CDD3E000166C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
84A388B81B1CDD3E000166C0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
84A388BA1B1CDD3E000166C0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
@ -941,7 +941,7 @@
84A388B41B1CDD3E000166C0 /* Products */ = {
isa = PBXGroup;
children = (
84A388B31B1CDD3E000166C0 /* Reicast.app */,
84A388B31B1CDD3E000166C0 /* Flycast.app */,
84A388C31B1CDD3F000166C0 /* reicast-osxTests.xctest */,
);
name = Products;
@ -2116,7 +2116,7 @@
);
name = "reicast-osx";
productName = "reicast-osx";
productReference = 84A388B31B1CDD3E000166C0 /* Reicast.app */;
productReference = 84A388B31B1CDD3E000166C0 /* Flycast.app */;
productType = "com.apple.product-type.application";
};
84A388C21B1CDD3F000166C0 /* reicast-osxTests */ = {
@ -2676,6 +2676,7 @@
);
INFOPLIST_FILE = "emulator-osx/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.flyinghead.Flycast;
PRODUCT_NAME = "$(REI_APP_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "emulator-osx/emulator-osx-Bridging-Header.h";
SWIFT_VERSION = 3.0;
@ -2844,6 +2845,7 @@
);
INFOPLIST_FILE = "emulator-osx/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.flyinghead.Flycast;
PRODUCT_NAME = "$(REI_APP_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "emulator-osx/emulator-osx-Bridging-Header.h";
SWIFT_VERSION = 3.0;

8
shell/apple/emulator-osx/reicast-osx.xcodeproj/xcshareddata/xcschemes/reicast-osx-naomi.xcscheme
View File

@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "Reicast.app"
BuildableName = "Flycast.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:reicast-osx.xcodeproj">
</BuildableReference>
@ -34,7 +34,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "Reicast.app"
BuildableName = "Flycast.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:reicast-osx.xcodeproj">
</BuildableReference>
@ -58,7 +58,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "Reicast.app"
BuildableName = "Flycast.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:reicast-osx.xcodeproj">
</BuildableReference>
@ -77,7 +77,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "Reicast.app"
BuildableName = "Flycast.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:reicast-osx.xcodeproj">
</BuildableReference>

8
shell/apple/emulator-osx/reicast-osx.xcodeproj/xcshareddata/xcschemes/reicast-osx.xcscheme
View File

@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "Reicast.app"
BuildableName = "Flycast.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:reicast-osx.xcodeproj">
</BuildableReference>
@ -58,7 +58,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "Reicast.app"
BuildableName = "Flycast.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:reicast-osx.xcodeproj">
</BuildableReference>
@ -82,7 +82,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "Reicast.app"
BuildableName = "Flycast.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:reicast-osx.xcodeproj">
</BuildableReference>
@ -101,7 +101,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "84A388B21B1CDD3E000166C0"
BuildableName = "Reicast.app"
BuildableName = "Flycast.app"
BlueprintName = "reicast-osx"
ReferencedContainer = "container:reicast-osx.xcodeproj">
</BuildableReference>

10
shell/windows/reicast.rc
View File

@ -22,13 +22,13 @@ BEGIN
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "Reicast Team"
VALUE "FileDescription", "Reicast"
VALUE "CompanyName", "Flycast Team"
VALUE "FileDescription", "Flycast"
VALUE "FileVersion", REICAST_VERSION
VALUE "InternalName", "reicast"
VALUE "LegalCopyright", "Copyright (c) Reicast Team. All rights reserved."
VALUE "OriginalFilename", "reicast.exe"
VALUE "ProductName", "Reicast"
VALUE "LegalCopyright", "Copyright (c) Reicast contributors. All rights reserved."
VALUE "OriginalFilename", "flycast.exe"
VALUE "ProductName", "Flycast"
VALUE "ProductVersion", REICAST_VERSION
END
END

8
wercker.yml
View File

@ -9,17 +9,17 @@ 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
- s3sync:
source_dir: s3
delete-removed: false