piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some pathnames are used both by SCons and cpp which can be a bit tricky.

Browse Source 
Should revisit and make the distinction more explicit.

Put the Data and Sys directories under Resources in the OS X app bundle.

Construct config.h (now lower-case to avoid confusion with other Config.h
instances in the tree) in the root. One tiny step towards a read-only
and cross-buildable source tree.

Some minor bits of non-Linux Unix portability.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5921 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-07-20 02:45:31 +00:00
parent c9855f2c22
commit 6813a75ab2
15 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/Common.h
View File

@ -112,7 +112,7 @@ extern const char *netplay_dolphin_ver;
#endif // end DEBUG/FAST
#else
#include "Config.h" // SCons autoconfiguration defines
#include "config.h" // SCons autoconfiguration defines
#endif
#if defined __linux__ && HAVE_BLUEZ

17
Source/Core/Common/Src/CommonPaths.h
View File

@ -18,9 +18,8 @@
#ifndef _COMMON_PATHS_H_
#define _COMMON_PATHS_H_
#ifdef __linux__
#include "Config.h"
#endif
// Make sure we pick up USER_DIR if set in config.h
#include "Common.h"
// Library suffix/prefix
#ifdef _WIN32
@ -29,7 +28,7 @@
#elif defined __APPLE__
#define PLUGIN_PREFIX "lib"
#define PLUGIN_SUFFIX ".dylib"
#elif defined __linux__
#else
#define PLUGIN_PREFIX "lib"
#define PLUGIN_SUFFIX ".so"
#endif
@ -43,7 +42,7 @@
#define PLUGINS_DIR "Plugins"
#elif defined __APPLE__
#define PLUGINS_DIR "Contents/PlugIns"
#elif defined __linux__
#else
#ifdef LIBS_DIR
#define PLUGINS_DIR LIBS_DIR "dolphin-emu"
#else
@ -60,9 +59,9 @@
// On OS X, USERDATA_DIR exists within the .app, but *always* reference
// the copy in Application Support instead! (Copied on first run)
// You can use the File::GetUserPath() util for this
#define USERDATA_DIR "Contents/User"
#define USERDATA_DIR "Contents/Resources/User"
#define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin"
#elif defined __linux__
#else
#define USERDATA_DIR "user"
#ifdef USER_DIR
#define DOLPHIN_DATA_DIR USER_DIR
@ -75,8 +74,8 @@
#ifdef _WIN32
#define SYSDATA_DIR "Sys"
#elif defined __APPLE__
#define SYSDATA_DIR "Contents/Sys"
#elif defined __linux__
#define SYSDATA_DIR "Contents/Resources/Sys"
#else
#ifdef DATA_DIR
#define SYSDATA_DIR DATA_DIR "sys"
#define SHARED_USER_DIR DATA_DIR USERDATA_DIR DIR_SEP

5
Source/Core/Core/Src/ActionReplay.cpp
View File

@ -422,11 +422,6 @@ bool RunCode(const ARCode &arcode)
switch (addr.type)
{
case 0x08:
LogInfo("Bad Normal Code type: 0x08");
return false;
break;
case 0x00:
if (false == NormalCode(addr, data))
return false;

10
Source/Core/DolphinWX/Src/SConscript
View File

@ -58,15 +58,15 @@ elif sys.platform == 'darwin' and not env['HAVE_WX']:
elif sys.platform == 'darwin' and env['HAVE_WX']:
exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
env.Install(env['binary_dir'] + 'Dolphin.app/Contents/' +
env.Install('#' + env['binary_dir'] + 'Dolphin.app/Contents/' +
'Library/Frameworks/Cg.framework',
'#Externals/Cg/Cg.framework/Cg')
env.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/',
env.Install('#' + env['binary_dir'] + 'Dolphin.app/Contents/Resources/',
'#Source/Core/DolphinWX/resources/Dolphin.icns')
env.Plist(
env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
'#' + env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
Value(dict(
CFBundleExecutable = 'Dolphin',
CFBundleIconFile = 'Dolphin.icns',
@ -86,6 +86,6 @@ else:
if env['HAVE_WX']:
env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles)
env.Program(exeGUI, files, LIBS = env['LIBS'] + wxlibs + libs)
env.Program('#' + exeGUI, files, LIBS = env['LIBS'] + wxlibs + libs)
else:
env.Program(exeNoGUI, files, LIBS = env['LIBS'] + libs)
env.Program('#' + exeNoGUI, files, LIBS = env['LIBS'] + libs)

10
Source/Core/InputCommon/Src/X11InputBase.h
View File

@ -18,18 +18,20 @@
#ifndef XINPUTBASE_H
#define XINPUTBASE_H
#include "Common.h"
#include <X11/X.h>
#include <X11/keysym.h>
#include "Config.h"
#if defined(HAVE_WX) && HAVE_WX
#include <wx/wx.h>
#endif
namespace InputCommon
{
#if defined(HAVE_WX) && HAVE_WX
KeySym wxCharCodeWXToX(int id);
int wxKeyModWXToX(int modstate);
KeySym wxCharCodeWXToX(int id);
int wxKeyModWXToX(int modstate);
#endif
void XKeyToString(unsigned int keycode, char *keyStr);
void XKeyToString(unsigned int keycode, char *keyStr);
}
#endif