diff --git a/build/Xenia.Cpp.x64.Checked.props b/build/Xenia.Cpp.x64.Checked.props index 22827f827..09a3d665a 100644 --- a/build/Xenia.Cpp.x64.Checked.props +++ b/build/Xenia.Cpp.x64.Checked.props @@ -6,7 +6,6 @@ false MultiThreadedDebugDLL - AdvancedVectorExtensions Guard ProgramDatabase CHECKED;%(PreprocessorDefinitions) @@ -18,6 +17,9 @@ $(SolutionDir)third_party\libav-xma-bin\lib\Debug;%(AdditionalLibraryDirectories) + + + \ No newline at end of file diff --git a/build/Xenia.Cpp.x64.Common.props b/build/Xenia.Cpp.x64.Common.props index b4e0a9ab4..22f7a1306 100644 --- a/build/Xenia.Cpp.x64.Common.props +++ b/build/Xenia.Cpp.x64.Common.props @@ -15,6 +15,7 @@ true MultiThreadedDLL false + AdvancedVectorExtensions $(SolutionDir)build\bin\$(Configuration)\ diff --git a/build/Xenia.Cpp.x64.Debug.props b/build/Xenia.Cpp.x64.Debug.props index 32df3a705..5734acae2 100644 --- a/build/Xenia.Cpp.x64.Debug.props +++ b/build/Xenia.Cpp.x64.Debug.props @@ -5,7 +5,6 @@ false - AdvancedVectorExtensions _NO_DEBUG_HEAP=1;DEBUG;XE_DEBUG=1;%(PreprocessorDefinitions) diff --git a/build/Xenia.Cpp.x64.Release.props b/build/Xenia.Cpp.x64.Release.props index 698d638c3..e784ac2f9 100644 --- a/build/Xenia.Cpp.x64.Release.props +++ b/build/Xenia.Cpp.x64.Release.props @@ -12,7 +12,6 @@ true false false - AdvancedVectorExtensions NDEBUG;%(PreprocessorDefinitions) true diff --git a/libxenia-base.vcxproj b/libxenia-base.vcxproj new file mode 100644 index 000000000..2478743c4 --- /dev/null +++ b/libxenia-base.vcxproj @@ -0,0 +1,144 @@ + + + + + Checked + x64 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {93533067-6449-4691-88A8-026EBCFDCA97} + Win32Proj + libxeniabase + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 + + + Windows + true + + + + + + + Level3 + + + Windows + true + + + + + Level3 + + + true + true + + + Windows + true + true + true + + + + + + diff --git a/libxenia-base.vcxproj.filters b/libxenia-base.vcxproj.filters new file mode 100644 index 000000000..56e89f7a2 --- /dev/null +++ b/libxenia-base.vcxproj.filters @@ -0,0 +1,123 @@ + + + + + {f20e4edb-dc80-4fb0-a1bf-76d2699f6358} + + + {2417e637-a3df-4149-8365-1e4f5424df45} + + + {3382641c-71e8-422c-afbf-fe45cbeb0ca3} + + + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + src\xenia\base + + + diff --git a/src/xenia/debug/ui/xe-debug-ui.vcxproj b/src/xenia/debug/ui/xe-debug-ui.vcxproj index ec585a767..1d3521a9a 100644 --- a/src/xenia/debug/ui/xe-debug-ui.vcxproj +++ b/src/xenia/debug/ui/xe-debug-ui.vcxproj @@ -36,13 +36,13 @@ - - + + - - + + @@ -82,4 +82,4 @@ - \ No newline at end of file + diff --git a/xenia.sln b/xenia.sln index 9979531bb..98467362e 100644 --- a/xenia.sln +++ b/xenia.sln @@ -13,6 +13,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxenia", "libxenia.vcxproj", "{0CE149F6-41C3-4224-9E57-C02E8C7CD312}" ProjectSection(ProjectDependencies) = postProject {AE4AF147-715A-4C24-8BFA-136332DED28F} = {AE4AF147-715A-4C24-8BFA-136332DED28F} + {93533067-6449-4691-88A8-026EBCFDCA97} = {93533067-6449-4691-88A8-026EBCFDCA97} {838020F9-94AA-4314-996D-69B923C45D39} = {838020F9-94AA-4314-996D-69B923C45D39} EndProjectSection EndProject @@ -61,6 +62,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xe-debug-ui", "src\xenia\de {838020F9-94AA-4314-996D-69B923C45D39} = {838020F9-94AA-4314-996D-69B923C45D39} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxenia-base", "libxenia-base.vcxproj", "{93533067-6449-4691-88A8-026EBCFDCA97}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Checked|x64 = Checked|x64 @@ -123,17 +126,17 @@ Global {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Release|x64.ActiveCfg = Release|x64 {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Release|x64.Build.0 = Release|x64 {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Checked|x64.ActiveCfg = Debug|x64 - {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Checked|x64.Build.0 = Debug|x64 {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Debug|x64.ActiveCfg = Debug|x64 - {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Debug|x64.Build.0 = Debug|x64 {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Release|x64.ActiveCfg = Release|x64 - {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Release|x64.Build.0 = Release|x64 {C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Checked|x64.ActiveCfg = Release|x64 - {C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Checked|x64.Build.0 = Release|x64 {C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Debug|x64.ActiveCfg = Debug|x64 - {C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Debug|x64.Build.0 = Debug|x64 {C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Release|x64.ActiveCfg = Release|x64 - {C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Release|x64.Build.0 = Release|x64 + {93533067-6449-4691-88A8-026EBCFDCA97}.Checked|x64.ActiveCfg = Checked|x64 + {93533067-6449-4691-88A8-026EBCFDCA97}.Checked|x64.Build.0 = Checked|x64 + {93533067-6449-4691-88A8-026EBCFDCA97}.Debug|x64.ActiveCfg = Debug|x64 + {93533067-6449-4691-88A8-026EBCFDCA97}.Debug|x64.Build.0 = Debug|x64 + {93533067-6449-4691-88A8-026EBCFDCA97}.Release|x64.ActiveCfg = Release|x64 + {93533067-6449-4691-88A8-026EBCFDCA97}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE