From 065049be70c9d4f676153fd891bb180176ea337e Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Tue, 1 Apr 2014 19:53:03 +0000 Subject: OS X: Improvements. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89774 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/Pcsxr.xcodeproj/project.pbxproj | 13 ++++------ .../Bladesio1/Base.lproj/Bladesio1PluginConfig.xib | 19 ++++++-------- macosx/plugins/Bladesio1/version.plist | 16 ------------ macosx/plugins/DFInput/Resources/DFInput.exp | 23 +++++++++++++++++ .../Shared/Base.lproj/NetSfPeopsSpuPluginMain.xib | 13 +++++----- .../Base.lproj/NetSfPeopsSoftGPUConfig.xib | 13 +++++----- .../PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.xib | 30 +++++++++------------- 7 files changed, 62 insertions(+), 65 deletions(-) delete mode 100644 macosx/plugins/Bladesio1/version.plist create mode 100644 macosx/plugins/DFInput/Resources/DFInput.exp diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj index c9b6edfe..eda66ad7 100644 --- a/macosx/Pcsxr.xcodeproj/project.pbxproj +++ b/macosx/Pcsxr.xcodeproj/project.pbxproj @@ -460,7 +460,6 @@ 551A74BF17868BEA0052D185 /* cfg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = ""; }; 551A74C017868BEA0052D185 /* PluginConfigController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginConfigController.h; sourceTree = ""; }; 551A74C117868BEA0052D185 /* PluginConfigController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginConfigController.m; sourceTree = ""; }; - 551A74C217868BEA0052D185 /* version.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = version.plist; sourceTree = ""; }; 551A750A17868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; 551A750E17868BEB0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 551A751017868BEB0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; @@ -622,9 +621,6 @@ 551A766B1786901F0052D185 /* pad.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pad.c; sourceTree = ""; }; 551A766C1786901F0052D185 /* pad.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = pad.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 551A766D1786901F0052D185 /* sdljoy.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sdljoy.c; sourceTree = ""; }; - 551A766E1786901F0052D185 /* util.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = util.c; sourceTree = ""; }; - 551A766F1786901F0052D185 /* util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = ""; }; - 551A76701786901F0052D185 /* xkb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = xkb.c; sourceTree = ""; }; 551A767A178690500052D185 /* DFCdrom.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFCdrom.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; 551A7684178691170052D185 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; 551A768E1786919F0052D185 /* DFInput.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFInput.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -677,6 +673,7 @@ 553FED0618DF5B0200C7B007 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/PCSXR.strings; sourceTree = ""; }; 553FED0718DF5B0500C7B007 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/PCSXR.strings; sourceTree = ""; }; 554572F217CBC69600FB7D19 /* SPUShared-info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SPUShared-info.plist"; sourceTree = ""; }; + 554B391418EB4C66000ADF68 /* DFInput.exp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.exports; name = DFInput.exp; path = Resources/DFInput.exp; sourceTree = ""; }; 554FD70817C6A13E0056CF66 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = ""; }; 5550D2711683C923006C56B5 /* RecentItemsMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RecentItemsMenu.h; sourceTree = ""; }; 5550D2721683C923006C56B5 /* RecentItemsMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RecentItemsMenu.m; sourceTree = ""; usesTabs = 1; }; @@ -1410,7 +1407,6 @@ 551A74B817868BEA0052D185 /* InfoPlist.strings */, 551A74BA17868BEA0052D185 /* Localizable.strings */, 551A74BC17868BEA0052D185 /* Info.plist */, - 551A74C217868BEA0052D185 /* version.plist */, ); name = Resources; sourceTree = ""; @@ -1594,9 +1590,6 @@ 551A766B1786901F0052D185 /* pad.c */, 551A766C1786901F0052D185 /* pad.h */, 551A766D1786901F0052D185 /* sdljoy.c */, - 551A766E1786901F0052D185 /* util.c */, - 551A766F1786901F0052D185 /* util.h */, - 551A76701786901F0052D185 /* xkb.c */, ); name = src; path = ../../../plugins/dfinput; @@ -1605,6 +1598,7 @@ 551A7671178690280052D185 /* Resources */ = { isa = PBXGroup; children = ( + 554B391418EB4C66000ADF68 /* DFInput.exp */, 551A751D17868BEB0052D185 /* Credits.rtf */, 551A751F17868BEB0052D185 /* InfoPlist.strings */, 551A752117868BEB0052D185 /* Localizable.strings */, @@ -3019,6 +3013,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_WARN_EMPTY_BODY = YES; + EXPORTED_SYMBOLS_FILE = plugins/DFInput/Resources/DFInput.exp; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -3042,6 +3037,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_WARN_EMPTY_BODY = YES; + EXPORTED_SYMBOLS_FILE = plugins/DFInput/Resources/DFInput.exp; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3473,6 +3469,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_WARN_EMPTY_BODY = YES; + EXPORTED_SYMBOLS_FILE = plugins/DFInput/Resources/DFInput.exp; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib b/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib index f0fdc522..83b3d538 100644 --- a/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib +++ b/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib @@ -1,8 +1,8 @@ - + - + @@ -17,7 +17,7 @@ - + @@ -28,7 +28,7 @@