rename more files to avoid master file collisions under linux

.tx/config

@@ -1,8 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[dolphin-emu.emulator]
+[ishiiruka.emulator]
 file_filter = Languages/po/<lang>.po
-source_file = Languages/po/dolphin-emu.pot
+source_file = Languages/po/ishiiruka.pot
 source_lang = en-US
 type = PO

CMakeLists.txt

@@ -86,10 +86,10 @@ set(LIBS)
 # Set up paths
 set(bindir  ${CMAKE_INSTALL_PREFIX}/bin               CACHE PATH "bindir")
 if(HAIKU)
-	set(datadir ${CMAKE_INSTALL_PREFIX}/data/dolphin-emu  CACHE PATH "datadir")
+	set(datadir ${CMAKE_INSTALL_PREFIX}/data/ishiiruka  CACHE PATH "datadir")
 	set(mandir  ${CMAKE_INSTALL_PREFIX}/documentation/man CACHE PATH "mandir")
 else()
-	set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir")
+	set(datadir ${CMAKE_INSTALL_PREFIX}/share/ishiiruka CACHE PATH "datadir")
 	set(mandir  ${CMAKE_INSTALL_PREFIX}/share/man         CACHE PATH "mandir")
 endif()
 add_definitions(-DDATA_DIR="${datadir}/")
@@ -804,16 +804,16 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD|Darwin")
 endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD")
   # Install the application icon and menu item
-  install(FILES Data/dolphin-emu.svg
+  install(FILES Data/ishiiruka.svg
           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
-  install(FILES Data/dolphin-emu.png
+  install(FILES Data/ishiiruka.png
           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps)
-  install(FILES Data/dolphin-emu.desktop
+  install(FILES Data/ishiiruka.desktop
           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
   # Install manpages
-  install(FILES Data/dolphin-emu.6
+  install(FILES Data/ishiiruka.6
           DESTINATION ${mandir}/man6)
-  install(FILES Data/dolphin-emu-nogui.6
+  install(FILES Data/ishiiruka-nogui.6
           DESTINATION ${mandir}/man6)
 endif()
 

Languages/Languages.vcxproj

@@ -68,7 +68,10 @@
     <OutDir>$(BinaryOutputDir)</OutDir>
   </PropertyGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <msgfmt>
+      <OutputName>$(OutDir)Languages\%(Filename)\ishiiruka.mo</OutputName>
+    </msgfmt>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Languages/po.rules

@@ -18,7 +18,7 @@
 					DisplayName="Output File"
 					Description="Specifies a name to override the default file name"
 					Switch="-o "[value]""
-					DefaultValue="$(OutDir)\Languages\$(InputName)\dolphin-emu.mo"
+					DefaultValue="$(OutDir)\Languages\$(InputName)\ishiiruka.mo"
 					Delimited="true"
 				/>
 				<BooleanProperty

Source/Core/Common/CommonPaths.h

@@ -21,10 +21,10 @@
 #define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin"
 #elif defined ANDROID
 #define USERDATA_DIR "user"
-#define DOLPHIN_DATA_DIR "/sdcard/dolphin-emu"
+#define DOLPHIN_DATA_DIR "/sdcard/ishiiruka"
 #else
 #define USERDATA_DIR "user"
-#define DOLPHIN_DATA_DIR "dolphin-emu"
+#define DOLPHIN_DATA_DIR "ishiiruka"
 #endif
 
 // Shared data dirs (Sys and shared User for Linux)
@@ -33,7 +33,7 @@
 #elif defined __APPLE__
 #define SYSDATA_DIR "Contents/Resources/Sys"
 #elif defined ANDROID
-#define SYSDATA_DIR "/sdcard/dolphin-emu"
+#define SYSDATA_DIR "/sdcard/ishiiruka"
 #else
 #ifdef DATA_DIR
 #define SYSDATA_DIR DATA_DIR "sys"

Source/Core/DolphinNoGUI/CMakeLists.txt

@@ -4,16 +4,16 @@ endif()
 
 set(NOGUI_SRCS MainNoGUI.cpp)
 
-add_executable(dolphin-nogui ${NOGUI_SRCS})
-set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME dolphin-emu-nogui)
+add_executable(ishiiruka-nogui ${NOGUI_SRCS})
+set_target_properties(ishiiruka-nogui PROPERTIES OUTPUT_NAME ishiiruka-nogui)
 
-target_link_libraries(dolphin-nogui PRIVATE
+target_link_libraries(ishiiruka-nogui PRIVATE
   core
   uicommon
   cpp-optparse
   ${LIBS}
 )
 
-set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} dolphin-nogui)
-install(TARGETS dolphin-nogui RUNTIME DESTINATION ${bindir})
+set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ishiiruka-nogui)
+install(TARGETS ishiiruka-nogui RUNTIME DESTINATION ${bindir})
 

Source/Core/DolphinWX/CMakeLists.txt

@@ -118,7 +118,7 @@ endif()
 # Handle localization
 find_package(Gettext)
 if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE)
-  set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot")
+  set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/ishiiruka.pot")
   file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
 
   target_sources(ishiiruka PRIVATE ${pot_file} ${LINGUAS})
@@ -128,7 +128,7 @@ if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE)
   foreach(po ${LINGUAS})
     get_filename_component(lang ${po} NAME_WE)
     set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang})
-    set(mo ${mo_dir}/dolphin-emu.mo)
+    set(mo ${mo_dir}/ishiiruka.mo)
 
     target_sources(ishiiruka PRIVATE ${mo})
     source_group("Localization\\\\Generated" FILES ${mo})

Source/Core/DolphinWX/Info.plist.in

@@ -30,7 +30,7 @@
     <key>CFBundleIconFile</key>
     <string>Dolphin.icns</string>
     <key>CFBundleIdentifier</key>
-    <string>org.dolphin-emu.dolphin</string>
+    <string>org.ishiiruka.dolphin</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundlePackageType</key>

Source/Core/DolphinWX/Main.cpp

@@ -318,7 +318,7 @@ void DolphinApp::InitLanguageSupport()
         StrToWxStr(File::GetBundleDirectory() + "Contents/Resources"));
 #endif
 
-    m_locale->AddCatalog("dolphin-emu");
+    m_locale->AddCatalog("ishiiruka");
 
     if (!m_locale->IsOk())
     {