diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/Asura.Editor/Asura.Editor.vcxproj | 4 | ||||
| -rw-r--r-- | Build/Asura.sln | 59 |
2 files changed, 38 insertions, 25 deletions
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj index 404c63a..124c4df 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj +++ b/Build/Asura.Editor/Asura.Editor.vcxproj @@ -76,7 +76,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -109,7 +109,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> diff --git a/Build/Asura.sln b/Build/Asura.sln index 59c1004..cafd6ab 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -3,43 +3,43 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28307.168 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd-party", "3rd-party", "{64D4E4B2-4A60-46F4-A500-370EFED4524F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{64D4E4B2-4A60-46F4-A500-370EFED4524F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Luax", "3rd-party\Luax\Luax.vcxproj", "{1350CEE9-B2C2-426A-AF4E-F651D51DD592}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Luax", "external\Luax\Luax.vcxproj", "{1350CEE9-B2C2-426A-AF4E-F651D51DD592}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glad", "3rd-party\glad\glad.vcxproj", "{C0ED7D78-570B-454A-B3B6-576FDCB43D69}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glad", "external\glad\glad.vcxproj", "{C0ED7D78-570B-454A-B3B6-576FDCB43D69}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "3rd-party\lua51\lua51.vcxproj", "{8B8FCA14-FC8A-45B4-BF3C-9340CB586076}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "external\lua51\lua51.vcxproj", "{8B8FCA14-FC8A-45B4-BF3C-9340CB586076}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT", "3rd-party\LuaJIT\LuaJIT.vcxproj", "{6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT", "external\LuaJIT\LuaJIT.vcxproj", "{6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51c", "3rd-party\lua51c\lua51c.vcxproj", "{B8F9616D-5393-4B34-B191-D200D1985439}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51c", "external\lua51c\lua51c.vcxproj", "{B8F9616D-5393-4B34-B191-D200D1985439}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E068D138-C824-4365-B5A3-27C65E8FD0B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "3rd-party\SDL2\SDL2.vcxproj", "{208B9CB8-2101-42A9-9502-0CF54912BC57}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "external\SDL2\SDL2.vcxproj", "{208B9CB8-2101-42A9-9502-0CF54912BC57}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "3rd-party\SDL2main\SDL2main.vcxproj", "{E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "external\SDL2main\SDL2main.vcxproj", "{E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rd-party\zlib\zlib.vcxproj", "{AF237AA3-67F7-4C93-8249-920DB2878192}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "external\zlib\zlib.vcxproj", "{AF237AA3-67F7-4C93-8249-920DB2878192}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAL", "3rd-party\OpenAL\OpenAL.vcxproj", "{38019689-27C2-488F-9C50-36CA6930CEB7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAL", "external\OpenAL\OpenAL.vcxproj", "{38019689-27C2-488F-9C50-36CA6930CEB7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpg123", "3rd-party\mpg123\mpg123.vcxproj", "{83E0897A-E2F4-4057-8077-59C4A0C38E56}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpg123", "external\mpg123\mpg123.vcxproj", "{83E0897A-E2F4-4057-8077-59C4A0C38E56}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "3rd-party\Box2D\Box2D.vcxproj", "{4122CC44-1E4C-4A08-B16F-1A650585EBD4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "external\Box2D\Box2D.vcxproj", "{4122CC44-1E4C-4A08-B16F-1A650585EBD4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis", "3rd-party\vorbis\vorbis.vcxproj", "{3CD80326-A2FE-4073-8B1A-73E166C9A2AE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis", "external\vorbis\vorbis.vcxproj", "{3CD80326-A2FE-4073-8B1A-73E166C9A2AE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "3rd-party\freetype\freetype.vcxproj", "{4B970273-A352-433B-98B2-B4BF6DF72F71}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "external\freetype\freetype.vcxproj", "{4B970273-A352-433B-98B2-B4BF6DF72F71}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LodePNG", "3rd-party\LodePNG\LodePNG.vcxproj", "{5AE9F39B-1885-4F81-96B1-121BB64F9939}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LodePNG", "external\LodePNG\LodePNG.vcxproj", "{5AE9F39B-1885-4F81-96B1-121BB64F9939}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stb", "3rd-party\stb\stb.vcxproj", "{6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stb", "external\stb\stb.vcxproj", "{6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wuff", "3rd-party\Wuff\Wuff.vcxproj", "{294889EA-93DE-4580-BF9D-87F605B229AA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wuff", "external\Wuff\Wuff.vcxproj", "{294889EA-93DE-4580-BF9D-87F605B229AA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physfs", "3rd-party\physfs\physfs.vcxproj", "{AEE37589-DE0D-4139-8BDB-8179FDEFB835}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physfs", "external\physfs\physfs.vcxproj", "{AEE37589-DE0D-4139-8BDB-8179FDEFB835}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{CD115016-E377-4AC1-8595-DB2836CEFE7E}" EndProject @@ -87,17 +87,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bindingGen", "tools\binding EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cembed", "tools\cembed\cembed.vcxproj", "{68FB36CB-C478-4158-A0BC-905B65340AE9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml2", "3rd-party\tinyxml2\tinyxml2.vcxproj", "{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml2", "external\tinyxml2\tinyxml2.vcxproj", "{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06-coroutine", "tests\06-coroutine\06-coroutine.vcxproj", "{C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-network", "modules\asura-network\asura-network.vcxproj", "{6361701E-BD43-4AE9-8AE2-5C8F87D436BA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaSocket", "3rd-party\LuaSocket\LuaSocket.vcxproj", "{E15D111A-9E02-4E0D-86FE-62BFCD3C211E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaSocket", "external\LuaSocket\LuaSocket.vcxproj", "{E15D111A-9E02-4E0D-86FE-62BFCD3C211E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plotscript", "3rd-party\Plotscript\Plotscript.vcxproj", "{2822F737-EEFA-4C74-872C-1EE0793E2221}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plotscript", "external\Plotscript\Plotscript.vcxproj", "{2822F737-EEFA-4C74-872C-1EE0793E2221}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuid4", "3rd-party\uuid4\uuid4.vcxproj", "{49F7847E-219E-4A7B-8484-2A33DAC29DD0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuid4", "external\uuid4\uuid4.vcxproj", "{49F7847E-219E-4A7B-8484-2A33DAC29DD0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-plot", "modules\asura-plot\asura-plot.vcxproj", "{F248C936-2169-45DF-8FC4-60E56EA23ECC}" EndProject @@ -109,10 +109,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-window", "tests\win32\01 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-log", "modules\asura-log\asura-log.vcxproj", "{11619483-427E-490F-9E82-4FED3591E93F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "3rd-party\sqlite\sqlite.vcxproj", "{61BF82F8-2802-4852-BF70-21D6F9F44EBB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "external\sqlite\sqlite.vcxproj", "{61BF82F8-2802-4852-BF70-21D6F9F44EBB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-fmod", "modules\asura-fmod\asura-fmod.vcxproj", "{CC451230-39E1-403A-8E1F-C3E7982049E5}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-base", "modules\asura-base\asura-base.vcxproj", "{4C2E4AA5-9AE7-461A-9C09-27D1ED516444}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -625,6 +627,16 @@ Global {CC451230-39E1-403A-8E1F-C3E7982049E5}.Release|x64.Build.0 = Release|x64 {CC451230-39E1-403A-8E1F-C3E7982049E5}.Release|x86.ActiveCfg = Release|Win32 {CC451230-39E1-403A-8E1F-C3E7982049E5}.Release|x86.Build.0 = Release|Win32 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|x64.ActiveCfg = Debug|x64 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|x64.Build.0 = Debug|x64 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|x86.ActiveCfg = Debug|Win32 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|x86.Build.0 = Debug|Win32 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|Any CPU.ActiveCfg = Release|Win32 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|x64.ActiveCfg = Release|x64 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|x64.Build.0 = Release|x64 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|x86.ActiveCfg = Release|Win32 + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -675,6 +687,7 @@ Global {11619483-427E-490F-9E82-4FED3591E93F} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {61BF82F8-2802-4852-BF70-21D6F9F44EBB} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {CC451230-39E1-403A-8E1F-C3E7982049E5} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} + {4C2E4AA5-9AE7-461A-9C09-27D1ED516444} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} |