From ffb171778845016a2dd18cf51f52ab1c21ee3dfb Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Tue, 30 Jun 2015 14:07:16 -0700 Subject: [PATCH] Adding xenia-project/turbobadger. Progress on #316. --- .gitmodules | 3 +++ libxenia.vcxproj | 4 ---- third_party/turbobadger | 1 + xenia.sln | 6 ++++++ 4 files changed, 10 insertions(+), 4 deletions(-) create mode 160000 third_party/turbobadger diff --git a/.gitmodules b/.gitmodules index 7a7156b10..ce23e9dff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "third_party/libav-xma-bin"] path = third_party/libav-xma-bin url = https://github.com/xenia-project/libav-xma-bin.git +[submodule "third_party/turbobadger"] + path = third_party/turbobadger + url = https://github.com/xenia-project/turbobadger.git diff --git a/libxenia.vcxproj b/libxenia.vcxproj index 1f446bd3a..6d298fd02 100644 --- a/libxenia.vcxproj +++ b/libxenia.vcxproj @@ -583,7 +583,6 @@ Level3 - Disabled BEA_ENGINE_STATIC=1;_LIB;%(PreprocessorDefinitions) $(SolutionDir)\third_party\libav-xma-bin\include\;$(SolutionDir)\third_party\beaengine\include\;$(SolutionDir)\third_party\llvm\include\;$(SolutionDir)\third_party\capstone\include\;%(AdditionalIncludeDirectories) @@ -601,7 +600,6 @@ Level3 - Disabled BEA_ENGINE_STATIC=1;_LIB;%(PreprocessorDefinitions) $(SolutionDir)\third_party\libav-xma-bin\include\;$(SolutionDir)\third_party\beaengine\include\;$(SolutionDir)\third_party\llvm\include\;$(SolutionDir)\third_party\capstone\include\;%(AdditionalIncludeDirectories) @@ -618,9 +616,7 @@ Level3 - MaxSpeed true - true BEA_ENGINE_STATIC=1;_LIB;%(PreprocessorDefinitions) $(SolutionDir)\third_party\libav-xma-bin\include\;$(SolutionDir)\third_party\beaengine\include\;$(SolutionDir)\third_party\llvm\include\;$(SolutionDir)\third_party\capstone\include\;%(AdditionalIncludeDirectories) diff --git a/third_party/turbobadger b/third_party/turbobadger new file mode 160000 index 000000000..37a373c17 --- /dev/null +++ b/third_party/turbobadger @@ -0,0 +1 @@ +Subproject commit 37a373c17d01bdfb29c844ac9a4d9c36d1467ffb diff --git a/xenia.sln b/xenia.sln index 15bac5511..d03433981 100644 --- a/xenia.sln +++ b/xenia.sln @@ -64,6 +64,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xe-gpu-trace-viewer", "src\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Xenia.Debug.Native", "src\Xenia.Debug.Native\Xenia.Debug.Native.vcxproj", "{5AE85790-F2EA-4077-8953-825E9C0AADE9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libturbobadger", "third_party\turbobadger\libturbobadger.vcxproj", "{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Checked|x64 = Checked|x64 @@ -149,6 +151,9 @@ Global {5AE85790-F2EA-4077-8953-825E9C0AADE9}.Debug|x64.Build.0 = Debug|x64 {5AE85790-F2EA-4077-8953-825E9C0AADE9}.Release|x64.ActiveCfg = Release|x64 {5AE85790-F2EA-4077-8953-825E9C0AADE9}.Release|x64.Build.0 = Release|x64 + {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Checked|x64.ActiveCfg = Debug|x64 + {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Debug|x64.ActiveCfg = Debug|x64 + {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -165,5 +170,6 @@ Global {C75532C4-765B-418E-B09B-46D36B2ABDB1} = {FCCBE57F-ECAE-420A-8A82-4B85F722C272} {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC} = {FD0BCA5D-908D-4091-AC05-47C2A640BA72} {5AE85790-F2EA-4077-8953-825E9C0AADE9} = {345BD157-B21D-4989-9CE4-FA3C90FFC095} + {156102D7-F2DD-4618-B2EB-2DFE607EE6DD} = {FCCBE57F-ECAE-420A-8A82-4B85F722C272} EndGlobalSection EndGlobal