diff --git a/Setup/Cosmos.iss b/Setup/Cosmos.iss index d6292837e..74acc7c2c 100644 --- a/Setup/Cosmos.iss +++ b/Setup/Cosmos.iss @@ -157,9 +157,9 @@ Source: ".\Build\Tools\*.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversio Source: ".\Build\Tools\NAsm\*.exe"; DestDir: "{app}\Build\Tools\NAsm"; Flags: ignoreversion uninsremovereadonly Source: ".\Build\Tools\Cygwin\*"; DestDir: "{app}\Build\Tools\cygwin"; Flags: ignoreversion uninsremovereadonly overwritereadonly Source: ".\Build\Tools\mkisofs\*"; DestDir: "{app}\Build\Tools\mkisofs"; Flags: ignoreversion uninsremovereadonly overwritereadonly -Source: ".\source\IL2CPU\bin\Debug\*.exe"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion ignoreversion uninsremovereadonly -Source: ".\source\IL2CPU\bin\Debug\*.dll"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion ignoreversion uninsremovereadonly -Source: ".\source\IL2CPU\bin\Debug\*.pdb"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion ignoreversion uninsremovereadonly +Source: ".\Build\VSIP\*.dll"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion ignoreversion uninsremovereadonly +Source: ".\Build\VSIP\*.exe"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion ignoreversion uninsremovereadonly +Source: ".\Build\VSIP\*.pdb"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion ignoreversion uninsremovereadonly ; Source: ".\Build\VSIP\Cosmos.Deploy.USB.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly @@ -243,8 +243,7 @@ Source: ".\Build\VSIP\Cosmos.zip"; DestDir: "{code:VSNET2013_PATH}\ProjectTempla Source: ".\Build\VSIP\CosmosKernel (C#).zip"; DestDir: "{code:GetCSharpExpress2013ProjectTemplatePath}"; DestName: "CosmosKernel (C#).zip"; Flags: ignoreversion uninsremovereadonly; Check: IsCSharpExpress2013Installed('dummy') ; Install templates into VB Express Source: ".\Build\VSIP\CosmosKernel (VB).zip"; DestDir: "{code:GetVBExpress2013ProjectTemplatePath}"; DestName: "CosmosKernel (VB).zip"; Flags: ignoreversion uninsremovereadonly; Check: IsVBExpress2013Installed('dummy') -;Compiler -Source: ".\source\IL2CPU\bin\Debug\*"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion uninsremovereadonly overwritereadonly + [Registry] ; Regiter .xs Extension diff --git a/Users/Matthijs/PlaygroundCore/PlaygroundCore.csproj b/Users/Matthijs/PlaygroundCore/PlaygroundCore.csproj index 3fe3ddf50..655cf26e5 100644 --- a/Users/Matthijs/PlaygroundCore/PlaygroundCore.csproj +++ b/Users/Matthijs/PlaygroundCore/PlaygroundCore.csproj @@ -20,6 +20,8 @@ DEBUG;TRACE prompt 4 + false + x86 pdbonly diff --git a/source/Build.sln b/source/Build.sln index 33cb99d12..8dc65eb79 100644 --- a/source/Build.sln +++ b/source/Build.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D95021E1-A2C9-4829-819E-ED433AF13162}" EndProject @@ -95,6 +95,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 System", "2 System", "{04 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.System", "Cosmos.System\Cosmos.System.csproj", "{3DEF0461-08AB-471A-8F03-A9C556652A0F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IL2CPU", "IL2CPU\IL2CPU.csproj", "{6128DEEB-D30F-4859-B60F-C36D5452F3E9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -505,6 +507,19 @@ Global {3DEF0461-08AB-471A-8F03-A9C556652A0F}.Release|Mixed Platforms.Build.0 = Release|x86 {3DEF0461-08AB-471A-8F03-A9C556652A0F}.Release|x86.ActiveCfg = Release|x86 {3DEF0461-08AB-471A-8F03-A9C556652A0F}.Release|x86.Build.0 = Release|x86 + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Debug|Itanium.ActiveCfg = Debug|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Debug|x86.ActiveCfg = Debug|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Debug|x86.Build.0 = Debug|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Release|Any CPU.Build.0 = Release|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Release|Itanium.ActiveCfg = Release|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6128DEEB-D30F-4859-B60F-C36D5452F3E9}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -545,5 +560,6 @@ Global {68875292-4A34-4A07-9BAA-06AA7DB26124} = {426E77A5-80AA-48DC-97F9-037071345778} {04CECC6E-BD09-4732-8408-ADCBC23DC2FF} = {426E77A5-80AA-48DC-97F9-037071345778} {3DEF0461-08AB-471A-8F03-A9C556652A0F} = {04CECC6E-BD09-4732-8408-ADCBC23DC2FF} + {6128DEEB-D30F-4859-B60F-C36D5452F3E9} = {6A15C540-8278-4B9C-B890-FA57FB6AE6A6} EndGlobalSection EndGlobal diff --git a/source/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj b/source/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj index f1e10e76f..f7a35a455 100644 --- a/source/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj +++ b/source/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj @@ -229,6 +229,6 @@ --> - + \ No newline at end of file diff --git a/source/IL2CPU/IL2CPU.csproj b/source/IL2CPU/IL2CPU.csproj index e5243da2f..7d30a74f6 100644 --- a/source/IL2CPU/IL2CPU.csproj +++ b/source/IL2CPU/IL2CPU.csproj @@ -26,7 +26,7 @@ AnyCPU pdbonly true - bin\Release\ + bin\Debug\ TRACE prompt 4