diff options
author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-10-14 22:51:56 +0300 |
---|---|---|
committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-10-14 22:51:56 +0300 |
commit | 06cc03c970c43a5766e20b08edc881d69e0ba4dc (patch) | |
tree | 63a6a197a7472d712213496a7d4730587a8012d8 /NesTiler | |
parent | 929ea2927deb85a8a3bf389c760b0f4966f0723b (diff) |
Keep line endings!
Diffstat (limited to 'NesTiler')
-rw-r--r-- | NesTiler/Makefile | 88 | ||||
-rw-r--r-- | NesTiler/NesTiler.csproj | 134 | ||||
-rw-r--r-- | NesTiler/nestiler-colors.json | 112 |
3 files changed, 167 insertions, 167 deletions
diff --git a/NesTiler/Makefile b/NesTiler/Makefile index 89d6cd6..30fa95d 100644 --- a/NesTiler/Makefile +++ b/NesTiler/Makefile @@ -1,44 +1,44 @@ -APP_NAME=nestiler -PROJECT_PATH=. -SUPPORTED_ARCHS=win-x86 win-x64 win-arm linux-x64 linux-arm osx-x64 - -OUTPUT_DIR?=release -CONFIGURATION?=Release -SELF_CONTAINED?=0 -ARCH?=win-x64 - -COMMIT=$(shell git rev-parse --short HEAD) -COMMIT_RESOURCE=$(PROJECT_PATH)/Resources/commit.txt -BUILDTIME_RESOURCE=$(PROJECT_PATH)/Resources/buildtime.txt - -ifeq ($(SELF_CONTAINED),0) - SC_OPS=--no-self-contained - SC_NAME= -else - SC_OPS=--self-contained true -p:PublishTrimmed=True - SC_NAME=-self-contained -endif - -build-all: - for arch in $(SUPPORTED_ARCHS); do make build ARCH=$$arch ; make build ARCH=$$arch SELF_CONTAINED=1 ; done - -release: clean build-all - for arch in $(SUPPORTED_ARCHS); do make archive ARCH=$$arch && make archive ARCH=$$arch SELF_CONTAINED=1; done - -commit: - echo -n $(COMMIT) > $(COMMIT_RESOURCE) - git diff-index --quiet HEAD -- || echo -n " (dirty)" >> $(COMMIT_RESOURCE) - -buildtime: - date -u +"%s" > $(BUILDTIME_RESOURCE) - -clean: - rm -rf $(OUTPUT_DIR) - dotnet clean -c Release - -build: - dotnet publish $(PROJECT_PATH) -c $(CONFIGURATION) -r $(ARCH) -p:PublishSingleFile=true $(SC_OPS) -p:IncludeAllContentForSelfExtract=true -o $(OUTPUT_DIR)/$(ARCH)$(SC_NAME)/$(APP_NAME) - -archive: - cd $(OUTPUT_DIR)/$(ARCH)$(SC_NAME) && tar -czvf ../$(APP_NAME)-$(ARCH)$(SC_NAME).tar.gz $(APP_NAME) - cd $(OUTPUT_DIR)/$(ARCH)$(SC_NAME) && zip -r9 ../$(APP_NAME)-$(ARCH)$(SC_NAME).zip $(APP_NAME) +APP_NAME=nestiler
+PROJECT_PATH=.
+SUPPORTED_ARCHS=win-x86 win-x64 win-arm linux-x64 linux-arm osx-x64
+
+OUTPUT_DIR?=release
+CONFIGURATION?=Release
+SELF_CONTAINED?=0
+ARCH?=win-x64
+
+COMMIT=$(shell git rev-parse --short HEAD)
+COMMIT_RESOURCE=$(PROJECT_PATH)/Resources/commit.txt
+BUILDTIME_RESOURCE=$(PROJECT_PATH)/Resources/buildtime.txt
+
+ifeq ($(SELF_CONTAINED),0)
+ SC_OPS=--no-self-contained
+ SC_NAME=
+else
+ SC_OPS=--self-contained true -p:PublishTrimmed=True
+ SC_NAME=-self-contained
+endif
+
+build-all:
+ for arch in $(SUPPORTED_ARCHS); do make build ARCH=$$arch ; make build ARCH=$$arch SELF_CONTAINED=1 ; done
+
+release: clean build-all
+ for arch in $(SUPPORTED_ARCHS); do make archive ARCH=$$arch && make archive ARCH=$$arch SELF_CONTAINED=1; done
+
+commit:
+ echo -n $(COMMIT) > $(COMMIT_RESOURCE)
+ git diff-index --quiet HEAD -- || echo -n " (dirty)" >> $(COMMIT_RESOURCE)
+
+buildtime:
+ date -u +"%s" > $(BUILDTIME_RESOURCE)
+
+clean:
+ rm -rf $(OUTPUT_DIR)
+ dotnet clean -c Release
+
+build:
+ dotnet publish $(PROJECT_PATH) -c $(CONFIGURATION) -r $(ARCH) -p:PublishSingleFile=true $(SC_OPS) -p:IncludeAllContentForSelfExtract=true -o $(OUTPUT_DIR)/$(ARCH)$(SC_NAME)/$(APP_NAME)
+
+archive:
+ cd $(OUTPUT_DIR)/$(ARCH)$(SC_NAME) && tar -czvf ../$(APP_NAME)-$(ARCH)$(SC_NAME).tar.gz $(APP_NAME)
+ cd $(OUTPUT_DIR)/$(ARCH)$(SC_NAME) && zip -r9 ../$(APP_NAME)-$(ARCH)$(SC_NAME).zip $(APP_NAME)
diff --git a/NesTiler/NesTiler.csproj b/NesTiler/NesTiler.csproj index c0aad69..aac25f8 100644 --- a/NesTiler/NesTiler.csproj +++ b/NesTiler/NesTiler.csproj @@ -1,68 +1,68 @@ -<Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> - <OutputType>Exe</OutputType> - <TargetFramework>net6.0</TargetFramework> - <RootNamespace>com.clusterrr.Famicom.NesTiler</RootNamespace> - <AssemblyName>nestiler</AssemblyName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> - <AllowUnsafeBlocks>False</AllowUnsafeBlocks> - <DebugType>none</DebugType> - <DebugSymbols>false</DebugSymbols> - </PropertyGroup> - <ItemGroup> - <None Remove=".git" /> - </ItemGroup> - <ItemGroup> - <PackageReference Include="ColorMinePortable" Version="2.0.1" /> - <PackageReference Include="SkiaSharp" Version="2.88.3" /> - <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" /> - </ItemGroup> - <ItemGroup> - <Compile Update="Properties\Resources.Designer.cs"> - <DesignTime>True</DesignTime> - <AutoGen>True</AutoGen> - <DependentUpon>Resources.resx</DependentUpon> - </Compile> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Update="Properties\Resources.resx"> - <Generator>ResXFileCodeGenerator</Generator> - <LastGenOutput>Resources.Designer.cs</LastGenOutput> - </EmbeddedResource> - </ItemGroup> - <ItemGroup> - <None Update="nestiler-colors.json"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - <ExcludeFromSingleFile>true</ExcludeFromSingleFile> - </None> - <None Include="..\LICENSE"> - <Pack>True</Pack> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - <ExcludeFromSingleFile>true</ExcludeFromSingleFile> - </None> - <None Include="..\README.md"> - <Pack>True</Pack> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - <ExcludeFromSingleFile>true</ExcludeFromSingleFile> - </None> - </ItemGroup> - <PropertyGroup> - <DebugType>embedded</DebugType> - <AssemblyVersion>0.1.0.0</AssemblyVersion> - <FileVersion>0.1.0.0</FileVersion> - <Version>0.1.0</Version> - <RepositoryUrl>https://github.com/ClusterM/nestiler</RepositoryUrl> - <Description>Tool for converting pictures into NES format: generating pattern tables, palettes, name tables</Description> - <Company>Alexey "Cluster" Avdyukhin</Company> - <Authors>Alexey "Cluster" Avdyukhin</Authors> - <PackageLicenseFile>LICENSE</PackageLicenseFile> - <Product>NesTiler</Product> - </PropertyGroup> - <Target Name="PreBuild" BeforeTargets="PreBuildEvent"> - <Exec Command="make commit buildtime
" /> - </Target> +<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+ <TargetFramework>net6.0</TargetFramework>
+ <RootNamespace>com.clusterrr.Famicom.NesTiler</RootNamespace>
+ <AssemblyName>nestiler</AssemblyName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <DebugType>none</DebugType>
+ <DebugSymbols>false</DebugSymbols>
+ </PropertyGroup>
+ <ItemGroup>
+ <None Remove=".git" />
+ </ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="ColorMinePortable" Version="2.0.1" />
+ <PackageReference Include="SkiaSharp" Version="2.88.3" />
+ <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Update="Properties\Resources.Designer.cs">
+ <DesignTime>True</DesignTime>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Update="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <None Update="nestiler-colors.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+ </None>
+ <None Include="..\LICENSE">
+ <Pack>True</Pack>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+ </None>
+ <None Include="..\README.md">
+ <Pack>True</Pack>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+ </None>
+ </ItemGroup>
+ <PropertyGroup>
+ <DebugType>embedded</DebugType>
+ <AssemblyVersion>0.1.0.0</AssemblyVersion>
+ <FileVersion>0.1.0.0</FileVersion>
+ <Version>0.1.0</Version>
+ <RepositoryUrl>https://github.com/ClusterM/nestiler</RepositoryUrl>
+ <Description>Tool for converting pictures into NES format: generating pattern tables, palettes, name tables</Description>
+ <Company>Alexey "Cluster" Avdyukhin</Company>
+ <Authors>Alexey "Cluster" Avdyukhin</Authors>
+ <PackageLicenseFile>LICENSE</PackageLicenseFile>
+ <Product>NesTiler</Product>
+ </PropertyGroup>
+ <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+ <Exec Command="make commit buildtime
" />
+ </Target>
</Project>
\ No newline at end of file diff --git a/NesTiler/nestiler-colors.json b/NesTiler/nestiler-colors.json index 6ec032d..dbf2bff 100644 --- a/NesTiler/nestiler-colors.json +++ b/NesTiler/nestiler-colors.json @@ -1,57 +1,57 @@ -{ - "0x00": "#747474", - "0x01": "#24188C", - "0x02": "#0000A8", - "0x03": "#44009C", - "0x04": "#8C0074", - "0x05": "#A80010", - "0x06": "#A40000", - "0x07": "#7C0800", - "0x08": "#402C00", - "0x09": "#004400", - "0x0A": "#005000", - "0x0B": "#003C14", - "0x0C": "#183C5C", - "0x10": "#BCBCBC", - "0x11": "#0070EC", - "0x12": "#2038EC", - "0x13": "#8000F0", - "0x14": "#BC00BC", - "0x15": "#E40058", - "0x16": "#D82800", - "0x17": "#C84C0C", - "0x18": "#887000", - "0x19": "#009400", - "0x1A": "#00A800", - "0x1B": "#009038", - "0x1C": "#008088", - "0x1D": "#000000", - "0x20": "#FCFCFC", - "0x21": "#3CBCFC", - "0x22": "#5C94FC", - "0x23": "#CC88FC", - "0x24": "#F478FC", - "0x25": "#FC74B4", - "0x26": "#FC7460", - "0x27": "#FC9838", - "0x28": "#F0BC3C", - "0x29": "#80D010", - "0x2A": "#4CDC48", - "0x2B": "#58F898", - "0x2C": "#00E8D8", - "0x2D": "#787878", - "0x30": "#FFFFFF", - "0x31": "#A8E4FC", - "0x32": "#C4D4FC", - "0x33": "#D4C8FC", - "0x34": "#FCC4FC", - "0x35": "#FCC4D8", - "0x36": "#FCBCB0", - "0x37": "#FCD8A8", - "0x38": "#FCE4A0", - "0x39": "#E0FCA0", - "0x3A": "#A8F0BC", - "0x3B": "#B0FCCC", - "0x3C": "#9CFCF0", - "0x3D": "#C4C4C4" +{
+ "0x00": "#747474",
+ "0x01": "#24188C",
+ "0x02": "#0000A8",
+ "0x03": "#44009C",
+ "0x04": "#8C0074",
+ "0x05": "#A80010",
+ "0x06": "#A40000",
+ "0x07": "#7C0800",
+ "0x08": "#402C00",
+ "0x09": "#004400",
+ "0x0A": "#005000",
+ "0x0B": "#003C14",
+ "0x0C": "#183C5C",
+ "0x10": "#BCBCBC",
+ "0x11": "#0070EC",
+ "0x12": "#2038EC",
+ "0x13": "#8000F0",
+ "0x14": "#BC00BC",
+ "0x15": "#E40058",
+ "0x16": "#D82800",
+ "0x17": "#C84C0C",
+ "0x18": "#887000",
+ "0x19": "#009400",
+ "0x1A": "#00A800",
+ "0x1B": "#009038",
+ "0x1C": "#008088",
+ "0x1D": "#000000",
+ "0x20": "#FCFCFC",
+ "0x21": "#3CBCFC",
+ "0x22": "#5C94FC",
+ "0x23": "#CC88FC",
+ "0x24": "#F478FC",
+ "0x25": "#FC74B4",
+ "0x26": "#FC7460",
+ "0x27": "#FC9838",
+ "0x28": "#F0BC3C",
+ "0x29": "#80D010",
+ "0x2A": "#4CDC48",
+ "0x2B": "#58F898",
+ "0x2C": "#00E8D8",
+ "0x2D": "#787878",
+ "0x30": "#FFFFFF",
+ "0x31": "#A8E4FC",
+ "0x32": "#C4D4FC",
+ "0x33": "#D4C8FC",
+ "0x34": "#FCC4FC",
+ "0x35": "#FCC4D8",
+ "0x36": "#FCBCB0",
+ "0x37": "#FCD8A8",
+ "0x38": "#FCE4A0",
+ "0x39": "#E0FCA0",
+ "0x3A": "#A8F0BC",
+ "0x3B": "#B0FCCC",
+ "0x3C": "#9CFCF0",
+ "0x3D": "#C4C4C4"
}
\ No newline at end of file |