mirror of
https://github.com/n64decomp/mk64
synced 2026-06-18 06:35:20 -04:00
Revert "Add ymls for Torch code generator (#497)"
This reverts commit 3da5a4f343.
This commit is contained in:
+1
-1
@@ -5,6 +5,6 @@
|
||||
/displaylist_packer
|
||||
/tkmk00
|
||||
/extract_data_for_mio
|
||||
/torch/build-cmake/*
|
||||
|
||||
__pycache__
|
||||
*.pyc
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
# Compilation flags
|
||||
CC := gcc
|
||||
MAKE = make
|
||||
CFLAGS := -I . -Wall -Wextra -Wno-unused-parameter -pedantic -std=c99 -O2 -s
|
||||
|
||||
# Tools to compile
|
||||
@@ -29,19 +28,6 @@ n64cksum_CFLAGS := -DN64CKSUM_STANDALONE
|
||||
|
||||
extract_data_for_mio_SOURCES := extract_data_for_mio.c
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
DETECTED_OS=windows
|
||||
# Set Windows temporary directory to its environment variable
|
||||
export TMPDIR=$(TEMP)
|
||||
else
|
||||
UNAME_S := $(shell uname -s)
|
||||
ifeq ($(UNAME_S),Linux)
|
||||
DETECTED_OS=linux
|
||||
else ifeq ($(UNAME_S),Darwin)
|
||||
DETECTED_OS=macos
|
||||
endif
|
||||
endif
|
||||
|
||||
# Build tools and recomp
|
||||
all: $(PROGRAMS)
|
||||
|
||||
@@ -62,5 +48,3 @@ $(1): $($1_SOURCES)
|
||||
endef
|
||||
|
||||
$(foreach p,$(PROGRAMS),$(eval $(call COMPILE,$(p))))
|
||||
|
||||
.PHONY: all clean default
|
||||
+213
-213
File diff suppressed because it is too large
Load Diff
@@ -212,7 +212,7 @@ def export_image(baserom, asset, asset_list):
|
||||
|
||||
if asset["type"] in ("ci4", "ci8"):
|
||||
# This is hightly specific to MK64:
|
||||
# Some TLUT images have a "stitched palette". This means that their palette is actually
|
||||
# Some TLUT images have a "stitched palette". This means that they're palette is actually
|
||||
# two smaller palettes stitched together.
|
||||
if "stitched_palette" in asset.get("meta", set()):
|
||||
palette_file = export_stitched_palette(baserom, asset, asset_list)
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user