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

Moving xenia-run to just be xenia.

This commit is contained in:
Ben Vanik 2014-12-19 16:50:27 -08:00
parent 9460f737e9
commit de9b6bdc8f
7 changed files with 32 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/alloy/frontend/ppc/test/test.gypi
View File

@ -12,8 +12,8 @@
}, },
'dependencies': [ 'dependencies': [
'alloy', 'liballoy',
'xenia', 'libxenia',
], ],
'include_dirs': [ 'include_dirs': [

8
src/alloy/test/test.gypi
View File

@ -12,8 +12,8 @@
}, },
'dependencies': [ 'dependencies': [
'alloy', 'liballoy',
'xenia', 'libxenia',
], ],
'include_dirs': [ 'include_dirs': [
@ -38,8 +38,8 @@
}, },
'dependencies': [ 'dependencies': [
'alloy', 'liballoy',
'xenia', 'libxenia',
], ],
'include_dirs': [ 'include_dirs': [

1
src/xenia/sources.gypi
View File

@ -15,6 +15,7 @@
'profiling.cc', 'profiling.cc',
'profiling.h', 'profiling.h',
'xbox.h', 'xbox.h',
# xenia_main.cc is purposefully omitted as it's used in another target.
], ],
'includes': [ 'includes': [

6
tools/xenia-run/xenia-run.cc → src/xenia/xenia_main.cc
View File

@ -16,13 +16,13 @@ using namespace xe;
DEFINE_string(target, "", "Specifies the target .xex or .iso to execute."); DEFINE_string(target, "", "Specifies the target .xex or .iso to execute.");
int xenia_run(std::vector<std::wstring>& args) { int xenia_main(std::vector<std::wstring>& args) {
Profiler::Initialize(); Profiler::Initialize();
Profiler::ThreadEnter("main"); Profiler::ThreadEnter("main");
// Grab path from the flag or unnamed argument. // Grab path from the flag or unnamed argument.
if (!FLAGS_target.size() && args.size() < 2) { if (!FLAGS_target.size() && args.size() < 2) {
google::ShowUsageWithFlags("xenia-run"); google::ShowUsageWithFlags("xenia");
PFATAL("Pass a file to launch."); PFATAL("Pass a file to launch.");
return 1; return 1;
} }
@ -71,4 +71,4 @@ int xenia_run(std::vector<std::wstring>& args) {
return 0; return 0;
} }
DEFINE_ENTRY_POINT(L"xenia-run", L"xenia-run some.xex", xenia_run); DEFINE_ENTRY_POINT(L"xenia", L"xenia some.xex", xenia_main);

1
tools/tools.gypi
View File

@ -1,6 +1,5 @@
# Copyright 2013 Ben Vanik. All Rights Reserved. # Copyright 2013 Ben Vanik. All Rights Reserved.
{ {
'includes': [ 'includes': [
'xenia-run/xenia-run.gypi',
], ],
} }

27
tools/xenia-run/xenia-run.gypi
View File

@ -1,27 +0,0 @@
# Copyright 2013 Ben Vanik. All Rights Reserved.
{
'targets': [
{
'target_name': 'xenia-run',
'type': 'executable',
'msvs_settings': {
'VCLinkerTool': {
'SubSystem': '2'
},
},
'dependencies': [
'xenia',
],
'include_dirs': [
'.',
],
'sources': [
'xenia-run.cc',
],
},
],
}

94
xenia.gyp
View File

@ -198,8 +198,8 @@
'targets': [ 'targets': [
{ {
'target_name': 'poly', 'target_name': 'libpoly',
'product_name': 'poly', 'product_name': 'libpoly',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
@ -279,15 +279,15 @@
}, },
{ {
'target_name': 'alloy', 'target_name': 'liballoy',
'product_name': 'alloy', 'product_name': 'liballoy',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'beaengine', 'beaengine',
'gflags', 'gflags',
'llvm', 'llvm',
'poly', 'libpoly',
], ],
'conditions': [ 'conditions': [
@ -309,7 +309,7 @@
'beaengine', 'beaengine',
'gflags', 'gflags',
'llvm', 'llvm',
'poly', 'libpoly',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
@ -365,19 +365,19 @@
}, },
{ {
'target_name': 'xenia', 'target_name': 'libxenia',
'product_name': 'xenia', 'product_name': 'libxenia',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'gflags', 'gflags',
'alloy', 'liballoy',
'poly', 'libpoly',
], ],
'export_dependent_settings': [ 'export_dependent_settings': [
'gflags', 'gflags',
'alloy', 'liballoy',
'poly', 'libpoly',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
@ -452,73 +452,25 @@
}, },
{ {
'target_name': 'xdb', 'target_name': 'xenia',
'product_name': 'xdb', 'type': 'executable',
'type': 'static_library',
'msvs_settings': {
'VCLinkerTool': {
'SubSystem': '2'
},
},
'dependencies': [ 'dependencies': [
'gflags', 'libxenia',
'xenia',
],
'export_dependent_settings': [
'gflags',
'xenia',
],
'direct_dependent_settings': {
'include_dirs': [
'src/',
],
'target_conditions': [
['_type=="shared_library"', {
'cflags': [
],
}],
['_type=="executable"', {
'conditions': [
['OS == "win"', {
'libraries': [
'kernel32',
'user32',
'ole32',
'wsock32',
'Ws2_32',
'Shell32',
'Msimg32',
'wxbase31u',
'wxmsw31u_core',
'wxmsw31u_aui',
'wxmsw31u_stc',
],
}],
['OS == "mac"', {
'xcode_settings': {
'OTHER_LDFLAGS': [
],
},
}],
['OS == "linux"', {
'libraries': [
'-lpthread',
'-ldl',
],
}],
],
}],
],
},
'cflags': [
], ],
'include_dirs': [ 'include_dirs': [
'.', '.',
'src/',
], ],
'includes': [ 'sources': [
'src/xdb/sources.gypi', 'src/xenia/xenia_main.cc',
], ],
}, },
], ],