Browse Source

Build changes.

pull/1/head
triton 13 years ago
parent
commit
c5cf6d2abf
  1. 7
      build/Parser.lua
  2. 87
      build/cxxi.sln
  3. 11
      build/premake4.lua
  4. 6
      build/vs2010/Parser.vcxproj

7
build/Parser.lua

@ -2,10 +2,7 @@ project "Parser" @@ -2,10 +2,7 @@ project "Parser"
kind "ConsoleApp"
language "C++"
targetdir "../bin"
debugdir "../bin"
flags { common_flags }
configuration "vs*"
@ -36,8 +33,6 @@ project "Parser" @@ -36,8 +33,6 @@ project "Parser"
configuration "*"
links
{
"LLVMSupport",

87
build/cxxi.sln

@ -22,9 +22,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "..\src\Generat @@ -22,9 +22,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "..\src\Generat
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Runtime", "..\src\Runtime\Runtime.csproj", "{6EE1E3FF-B737-4874-B7BC-D1B5297E162C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSDL", "..\bin\gen\build\NSDL\NSDL.csproj", "{77BA1CDF-2DA3-451A-8E4A-A9074236140A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Tests", "..\src\Generator.Tests\Generator.Tests.csproj", "{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clang", "..\bin\gen\build\Clang\Clang.csproj", "{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{018A0BF1-788C-4366-BC67-8C4E7D14F5B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Clang", "..\examples\Clang\Generator.Clang.csproj", "{5439BC03-FA91-4D93-9EA0-4E550C1610F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Flood", "..\examples\Flood\Generator.Flood.csproj", "{28455425-1A80-458E-952C-5B0069866AAD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.SDL", "..\examples\SDL\Generator.SDL.csproj", "{8D642354-FBD5-4551-95A6-09D369B83167}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -135,32 +141,54 @@ Global @@ -135,32 +141,54 @@ Global
{6EE1E3FF-B737-4874-B7BC-D1B5297E162C}.Release|Win32.Build.0 = Release|x86
{6EE1E3FF-B737-4874-B7BC-D1B5297E162C}.Release|x86.ActiveCfg = Release|x86
{6EE1E3FF-B737-4874-B7BC-D1B5297E162C}.Release|x86.Build.0 = Release|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Debug|Any CPU.ActiveCfg = Debug|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Debug|Mixed Platforms.Build.0 = Debug|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Debug|Win32.ActiveCfg = Debug|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Debug|Win32.Build.0 = Debug|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Debug|x86.ActiveCfg = Debug|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Debug|x86.Build.0 = Debug|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|Any CPU.ActiveCfg = Release|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|Mixed Platforms.ActiveCfg = Release|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|Mixed Platforms.Build.0 = Release|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|Win32.ActiveCfg = Release|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|Win32.Build.0 = Release|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|x86.ActiveCfg = Release|x86
{77BA1CDF-2DA3-451A-8E4A-A9074236140A}.Release|x86.Build.0 = Release|x86
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Any CPU.Build.0 = Debug|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|Win32.ActiveCfg = Debug|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Debug|x86.ActiveCfg = Debug|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Any CPU.ActiveCfg = Release|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Any CPU.Build.0 = Release|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|Win32.ActiveCfg = Release|Any CPU
{546F6CAB-94BB-4B2F-B65E-D19CBF38DB75}.Release|x86.ActiveCfg = Release|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Debug|Win32.ActiveCfg = Debug|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Debug|x86.ActiveCfg = Debug|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Release|Any CPU.Build.0 = Release|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Release|Win32.ActiveCfg = Release|Any CPU
{3EC927F3-5F8D-4D5D-B230-901ED2BB5D32}.Release|x86.ActiveCfg = Release|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Debug|Win32.ActiveCfg = Debug|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Debug|x86.ActiveCfg = Debug|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Release|Any CPU.Build.0 = Release|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Release|Win32.ActiveCfg = Release|Any CPU
{5439BC03-FA91-4D93-9EA0-4E550C1610F3}.Release|x86.ActiveCfg = Release|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Debug|Win32.ActiveCfg = Debug|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Debug|x86.ActiveCfg = Debug|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Release|Any CPU.Build.0 = Release|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Release|Win32.ActiveCfg = Release|Any CPU
{28455425-1A80-458E-952C-5B0069866AAD}.Release|x86.ActiveCfg = Release|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Debug|Win32.ActiveCfg = Debug|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Debug|x86.ActiveCfg = Debug|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Release|Any CPU.Build.0 = Release|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Release|Win32.ActiveCfg = Release|Any CPU
{8D642354-FBD5-4551-95A6-09D369B83167}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -169,6 +197,9 @@ Global @@ -169,6 +197,9 @@ Global
{3C290CBE-CA39-47F6-B3A0-ACD16C5A38C8} = {CC1EED48-730C-417A-9390-525BBCB518DA}
{AD0F9378-789C-4AF1-B0DD-6DD9A63C3401} = {CC1EED48-730C-417A-9390-525BBCB518DA}
{4A864586-93C5-4DC1-8A80-F094A88506D7} = {CC1EED48-730C-417A-9390-525BBCB518DA}
{5439BC03-FA91-4D93-9EA0-4E550C1610F3} = {018A0BF1-788C-4366-BC67-8C4E7D14F5B3}
{28455425-1A80-458E-952C-5B0069866AAD} = {018A0BF1-788C-4366-BC67-8C4E7D14F5B3}
{8D642354-FBD5-4551-95A6-09D369B83167} = {018A0BF1-788C-4366-BC67-8C4E7D14F5B3}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\generator\generator.csproj

11
build/premake4.lua

@ -19,13 +19,11 @@ solution "Cxxi2" @@ -19,13 +19,11 @@ solution "Cxxi2"
"Release"
}
debugdir "bin"
startup "Parser"
location (action)
objdir (action .. "/obj/")
targetdir (action .. "/lib/")
targetdir (action .. "/lib/")
targetdir (action .. "/bin/")
debugdir (action .. "/bin/")
configuration "Debug"
defines { "DEBUG" }
@ -35,5 +33,4 @@ solution "Cxxi2" @@ -35,5 +33,4 @@ solution "Cxxi2"
defines { "NDEBUG" }
flags { "Optimize" }
dofile "Parser.lua"
dofile "Parser.lua"

6
build/vs2010/Parser.vcxproj

@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\build\bin\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\Debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Parser_d</TargetName>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
<ClCompile>
<AdditionalOptions>/wd4146 /wd4244 /wd4800 /wd4345 /wd4355 /wd4996 /wd4624 /wd4291 /clr %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\LLVM\include;..\..\..\LLVM\build\include;..\..\..\LLVM\tools\clang\include;..\..\..\LLVM\build\tools\clang\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\auth\LLVM\include;..\..\..\auth\LLVM\build\include;..\..\..\auth\LLVM\tools\clang\include;..\..\..\auth\LLVM\build\tools\clang\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>LLVMSupport.lib;LLVMAsmParser.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMX86AsmParser.lib;LLVMX86AsmPrinter.lib;LLVMX86Desc.lib;LLVMX86Info.lib;LLVMX86Utils.lib;clangAnalysis.lib;clangBasic.lib;clangAST.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\LLVM\build\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\auth\LLVM\build\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<EntryPointSymbol>
</EntryPointSymbol>
</Link>

Loading…
Cancel
Save