diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fced5f0ab..d42b7a1b80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,6 @@ project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) set(DOLPHIN_IS_STABLE FALSE) -set(prefix ${CMAKE_INSTALL_PREFIX} CACHE PATH "prefix") set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir") set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "libdir") set(plugindir ${libdir}/dolphin-emu CACHE PATH "plugindir") @@ -358,7 +357,9 @@ add_subdirectory(Source) # install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN .svn EXCLUDE) install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN .svn EXCLUDE) -install(FILES Data/license.txt DESTINATION ${datadir}) +if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) + install(FILES Data/license.txt DESTINATION ${datadir}) +endif() # packaging information set(CPACK_PACKAGE_NAME "dolphin-emu") diff --git a/Data/User/Wii/shared2/wc24/mbox/WC24RECV.CTL b/Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl similarity index 100% rename from Data/User/Wii/shared2/wc24/mbox/WC24RECV.CTL rename to Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl diff --git a/Data/User/Wii/shared2/wc24/mbox/WC24RECV.MBX b/Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx similarity index 100% rename from Data/User/Wii/shared2/wc24/mbox/WC24RECV.MBX rename to Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx diff --git a/Data/User/Wii/shared2/wc24/mbox/WC24SEND.CTL b/Data/User/Wii/shared2/wc24/mbox/wc24send.ctl similarity index 100% rename from Data/User/Wii/shared2/wc24/mbox/WC24SEND.CTL rename to Data/User/Wii/shared2/wc24/mbox/wc24send.ctl diff --git a/Data/User/Wii/shared2/wc24/mbox/WC24SEND.MBX b/Data/User/Wii/shared2/wc24/mbox/wc24send.mbx similarity index 100% rename from Data/User/Wii/shared2/wc24/mbox/WC24SEND.MBX rename to Data/User/Wii/shared2/wc24/mbox/wc24send.mbx diff --git a/Data/User/Wii/shared2/wc24/MISC.BIN b/Data/User/Wii/shared2/wc24/misc.bin similarity index 100% rename from Data/User/Wii/shared2/wc24/MISC.BIN rename to Data/User/Wii/shared2/wc24/misc.bin diff --git a/Data/User/Wii/shared2/wc24/NWC24DL.BIN b/Data/User/Wii/shared2/wc24/nwc24dl.bin similarity index 100% rename from Data/User/Wii/shared2/wc24/NWC24DL.BIN rename to Data/User/Wii/shared2/wc24/nwc24dl.bin diff --git a/Data/User/Wii/shared2/wc24/NWC24FL.BIN b/Data/User/Wii/shared2/wc24/nwc24fl.bin similarity index 100% rename from Data/User/Wii/shared2/wc24/NWC24FL.BIN rename to Data/User/Wii/shared2/wc24/nwc24fl.bin diff --git a/Data/User/Wii/shared2/wc24/NWC24FLS.BIN b/Data/User/Wii/shared2/wc24/nwc24fls.bin similarity index 100% rename from Data/User/Wii/shared2/wc24/NWC24FLS.BIN rename to Data/User/Wii/shared2/wc24/nwc24fls.bin diff --git a/Data/User/Wii/shared2/wc24/NWC24MSG.CBK b/Data/User/Wii/shared2/wc24/nwc24msg.cbk similarity index 100% rename from Data/User/Wii/shared2/wc24/NWC24MSG.CBK rename to Data/User/Wii/shared2/wc24/nwc24msg.cbk diff --git a/Data/User/Wii/shared2/wc24/NWC24MSG.CFG b/Data/User/Wii/shared2/wc24/nwc24msg.cfg similarity index 100% rename from Data/User/Wii/shared2/wc24/NWC24MSG.CFG rename to Data/User/Wii/shared2/wc24/nwc24msg.cfg diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 1d78511a75..f9bf7d26a7 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -808,20 +808,20 @@ void SetStatus() { if (!fifo.bFF_Breakpoint) - INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %i %i", fifo.CPReadPointer); + INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %i", fifo.CPReadPointer); fifo.bFF_Breakpoint = true; } else { if (fifo.bFF_Breakpoint) - INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %i %i", fifo.CPReadPointer); + INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %i", fifo.CPReadPointer); fifo.bFF_Breakpoint = false; } } else { if (fifo.bFF_Breakpoint) - INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %i %i", fifo.CPReadPointer); + INFO_LOG(COMMANDPROCESSOR, "Cleared breakpoint at %i", fifo.CPReadPointer); fifo.bFF_Breakpoint = false; }