Skip to content

Commit 807ae9f

Browse files
author
PiKeyAr
committed
Paths overhaul
1 parent 4ec866f commit 807ae9f

File tree

2,083 files changed

+725447
-49741
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,083 files changed

+725447
-49741
lines changed

‎BuildScript.ini

+8-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
.=Configuration
2-
SAToolsHub.exe=SAToolsHub\\bin\\SAToolsHub.exe
3-
SAToolsHub.exe.config=SAToolsHub\\bin\\SAToolsHub.exe.config
4-
SAToolsHub.pdb=SAToolsHub\\bin\\SAToolsHub.pdb
5-
bin=bin
6-
tools=tools
7-
tools\\lib\\SACompGC.dll=Dependencies\\SACompGC.dll
8-
bin\\lib=tools\\lib
9-
bin\\readme.txt=Configuration\\bin\\readme.txt
10-
SADXPC\\objdefs\\Common=SADXObjectDefinitions\\Common
11-
SADXPC\\objdefs\\Level Effects=SADXObjectDefinitions\\Level Effects
12-
SADXPC\\objdefs\\Emerald Coast=SADXObjectDefinitions\\Emerald Coast
13-
SADXPC\\objdefs\\Windy Valley=SADXObjectDefinitions\\Windy Valley
14-
SADXPC\\objdefs\\Mission=SADXObjectDefinitions\\Mission
1+
.=build
2+
GameConfig=GameConfig
3+
bin\\readme.txt=readmeCmd.txt
4+
GameConfig\\PC_SADX\\objdefs\\Common=SA1Tools\\SADXObjectDefinitions\\Common
5+
GameConfig\\PC_SADX\\objdefs\\Level Effects=SA1Tools\\SADXObjectDefinitions\\Level Effects
6+
GameConfig\\PC_SADX\\objdefs\\Emerald Coast=SA1Tools\\SADXObjectDefinitions\\Emerald Coast
7+
GameConfig\\PC_SADX\\objdefs\\Windy Valley=SA1Tools\\SADXObjectDefinitions\\Windy Valley
8+
GameConfig\\PC_SADX\\objdefs\\Mission=SA1Tools\\SADXObjectDefinitions\\Mission

‎AnimJSONConverter/AnimJSONConverter.csproj ‎CommandLine/AnimJSONConverter/AnimJSONConverter.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<DebugSymbols>true</DebugSymbols>
1818
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
20-
<OutputPath>..\bin\</OutputPath>
20+
<OutputPath>..\..\build\bin\</OutputPath>
2121
<DefineConstants>DEBUG;TRACE</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
@@ -27,15 +27,15 @@
2727
<PlatformTarget>AnyCPU</PlatformTarget>
2828
<DebugType>pdbonly</DebugType>
2929
<Optimize>true</Optimize>
30-
<OutputPath>..\bin\</OutputPath>
30+
<OutputPath>..\..\build\bin\</OutputPath>
3131
<DefineConstants>TRACE</DefineConstants>
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
3434
<Prefer32Bit>false</Prefer32Bit>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
37+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
3939
<Private>False</Private>
4040
</Reference>
4141
<Reference Include="System" />
@@ -56,7 +56,7 @@
5656
<None Include="packages.config" />
5757
</ItemGroup>
5858
<ItemGroup>
59-
<ProjectReference Include="..\SAModel\SAModel.csproj">
59+
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj">
6060
<Project>{0ee5d36f-cacf-41e9-8c9a-76ffd946b22d}</Project>
6161
<Name>SAModel</Name>
6262
<Private>False</Private>

‎AnimJSONConverter/Program.cs ‎CommandLine/AnimJSONConverter/Program.cs

File renamed without changes.

‎AnimJSONConverter/Properties/AssemblyInfo.cs ‎CommandLine/AnimJSONConverter/Properties/AssemblyInfo.cs

File renamed without changes.

‎AnimJSONConverter/app.config ‎CommandLine/AnimJSONConverter/app.config

File renamed without changes.

‎CommandLine/AnimJSONConverter/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
4+
</packages>

‎ArchiveTool/App.config ‎CommandLine/ArchiveTool/App.config

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
3-
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
5-
<runtime>
6-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
7-
<probing privatePath="lib"/>
8-
</assemblyBinding>
9-
</runtime>
10-
</configuration>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
5+
<runtime>
6+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
7+
<probing privatePath="lib"/>
8+
</assemblyBinding>
9+
</runtime>
10+
</configuration>

‎ArchiveTool/ArchiveTool.csproj ‎CommandLine/ArchiveTool/ArchiveTool.csproj

+89-89
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{ABE90887-11AC-4FDE-B58A-1841BEA128B3}</ProjectGuid>
8-
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>ArchiveTool</RootNamespace>
11-
<AssemblyName>ArchiveTool</AssemblyName>
12-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<TargetFrameworkProfile />
16-
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<PlatformTarget>AnyCPU</PlatformTarget>
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>..\bin\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
<Prefer32Bit>false</Prefer32Bit>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<PlatformTarget>AnyCPU</PlatformTarget>
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>..\bin\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
<Prefer32Bit>false</Prefer32Bit>
37-
</PropertyGroup>
38-
<ItemGroup>
39-
<Reference Include="FraGag.Compression.Prs">
40-
<HintPath>..\Dependencies\FraGag.Compression.Prs.dll</HintPath>
41-
<Private>False</Private>
42-
</Reference>
43-
<Reference Include="System" />
44-
<Reference Include="System.Core" />
45-
<Reference Include="System.Drawing" />
46-
<Reference Include="VrSharp">
47-
<HintPath>..\Dependencies\VrSharp.dll</HintPath>
48-
<Private>False</Private>
49-
</Reference>
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Compile Include="ConvertArchive.cs" />
53-
<Compile Include="CreateArchive.cs" />
54-
<Compile Include="ExtractArchive.cs" />
55-
<Compile Include="Program.cs" />
56-
<Compile Include="Properties\AssemblyInfo.cs" />
57-
</ItemGroup>
58-
<ItemGroup>
59-
<None Include="App.config" />
60-
</ItemGroup>
61-
<ItemGroup>
62-
<ProjectReference Include="..\ArchiveLib\ArchiveLib.csproj">
63-
<Project>{29bd5a4f-1400-471c-bcfc-f1ee2a0ec73a}</Project>
64-
<Name>ArchiveLib</Name>
65-
<Private>False</Private>
66-
</ProjectReference>
67-
<ProjectReference Include="..\SA Tools\SA Tools.csproj">
68-
<Project>{50847bdb-699d-4a2e-aaf7-1ea58e1ec48e}</Project>
69-
<Name>SA Tools</Name>
70-
<Private>False</Private>
71-
</ProjectReference>
72-
<ProjectReference Include="..\SAModel\SAModel.csproj">
73-
<Project>{0ee5d36f-cacf-41e9-8c9a-76ffd946b22d}</Project>
74-
<Name>SAModel</Name>
75-
<Private>False</Private>
76-
</ProjectReference>
77-
</ItemGroup>
78-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
79-
<PropertyGroup>
80-
<PostBuildEvent>xcopy /D /Y "$(SolutionDir)Dependencies\VrSharp.dll" "$(SolutionDir)tools\lib\"
81-
xcopy /D /Y "$(SolutionDir)Dependencies\FraGag.Compression.Prs.dll" "$(SolutionDir)tools\lib\"</PostBuildEvent>
82-
</PropertyGroup>
83-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
84-
Other similar extension points exist, see Microsoft.Common.targets.
85-
<Target Name="BeforeBuild">
86-
</Target>
87-
<Target Name="AfterBuild">
88-
</Target>
89-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{ABE90887-11AC-4FDE-B58A-1841BEA128B3}</ProjectGuid>
8+
<OutputType>Exe</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>ArchiveTool</RootNamespace>
11+
<AssemblyName>ArchiveTool</AssemblyName>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15+
<TargetFrameworkProfile />
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<PlatformTarget>AnyCPU</PlatformTarget>
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<OutputPath>..\..\build\bin\</OutputPath>
23+
<DefineConstants>DEBUG;TRACE</DefineConstants>
24+
<ErrorReport>prompt</ErrorReport>
25+
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<PlatformTarget>AnyCPU</PlatformTarget>
30+
<DebugType>pdbonly</DebugType>
31+
<Optimize>true</Optimize>
32+
<OutputPath>..\..\build\bin\</OutputPath>
33+
<DefineConstants>TRACE</DefineConstants>
34+
<ErrorReport>prompt</ErrorReport>
35+
<WarningLevel>4</WarningLevel>
36+
<Prefer32Bit>false</Prefer32Bit>
37+
</PropertyGroup>
38+
<ItemGroup>
39+
<Reference Include="FraGag.Compression.Prs">
40+
<HintPath>..\..\Dependencies\FraGag.Compression.Prs.dll</HintPath>
41+
<Private>False</Private>
42+
</Reference>
43+
<Reference Include="System" />
44+
<Reference Include="System.Core" />
45+
<Reference Include="System.Drawing" />
46+
<Reference Include="VrSharp">
47+
<HintPath>..\..\Dependencies\VrSharp.dll</HintPath>
48+
<Private>False</Private>
49+
</Reference>
50+
</ItemGroup>
51+
<ItemGroup>
52+
<Compile Include="ConvertArchive.cs" />
53+
<Compile Include="CreateArchive.cs" />
54+
<Compile Include="ExtractArchive.cs" />
55+
<Compile Include="Program.cs" />
56+
<Compile Include="Properties\AssemblyInfo.cs" />
57+
</ItemGroup>
58+
<ItemGroup>
59+
<None Include="App.config" />
60+
</ItemGroup>
61+
<ItemGroup>
62+
<ProjectReference Include="..\..\Libraries\ArchiveLib\ArchiveLib.csproj">
63+
<Project>{29bd5a4f-1400-471c-bcfc-f1ee2a0ec73a}</Project>
64+
<Name>ArchiveLib</Name>
65+
<Private>False</Private>
66+
</ProjectReference>
67+
<ProjectReference Include="..\..\Libraries\SA Tools\SA Tools.csproj">
68+
<Project>{50847bdb-699d-4a2e-aaf7-1ea58e1ec48e}</Project>
69+
<Name>SA Tools</Name>
70+
<Private>False</Private>
71+
</ProjectReference>
72+
<ProjectReference Include="..\..\Libraries\SAModel\SAModel.csproj">
73+
<Project>{0ee5d36f-cacf-41e9-8c9a-76ffd946b22d}</Project>
74+
<Name>SAModel</Name>
75+
<Private>False</Private>
76+
</ProjectReference>
77+
</ItemGroup>
78+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
79+
<PropertyGroup>
80+
<PostBuildEvent>xcopy /D /Y "$(SolutionDir)Dependencies\VrSharp.dll" "$(SolutionDir)build\tools\lib\"
81+
xcopy /D /Y "$(SolutionDir)Dependencies\FraGag.Compression.Prs.dll" "$(SolutionDir)build\tools\lib\"</PostBuildEvent>
82+
</PropertyGroup>
83+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
84+
Other similar extension points exist, see Microsoft.Common.targets.
85+
<Target Name="BeforeBuild">
86+
</Target>
87+
<Target Name="AfterBuild">
88+
</Target>
89+
-->
9090
</Project>

‎ArchiveTool/ConvertArchive.cs ‎CommandLine/ArchiveTool/ConvertArchive.cs

File renamed without changes.

‎ArchiveTool/CreateArchive.cs ‎CommandLine/ArchiveTool/CreateArchive.cs

File renamed without changes.

‎ArchiveTool/ExtractArchive.cs ‎CommandLine/ArchiveTool/ExtractArchive.cs

File renamed without changes.

0 commit comments

Comments
 (0)