diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2024-04-09 22:24:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-09 22:24:11 -0600 |
| commit | ad495221f7d26f51bba379e7e8f6baf877228ef1 (patch) | |
| tree | f168a3ea7ca9f8f8bf59dc62d79c4b221b251e3e /tools | |
| parent | 3da5a4f343fa708abcc461d83337ef6df9863447 (diff) | |
Fix torch (#600)
* Fixed torch
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 22 | ||||
| m--------- | tools/torch | 0 | ||||
| -rwxr-xr-x | tools/torch/torch | bin | 4308008 -> 0 bytes |
3 files changed, 7 insertions, 15 deletions
diff --git a/tools/Makefile b/tools/Makefile index 5d989acaa..9dad1694c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -29,25 +29,17 @@ 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) +all: $(PROGRAMS) torch + +torch: + @echo "Building Torch..." + $(MAKE) -C torch type=release -j$(N_THREADS) # Remove generated files clean: $(RM) $(PROGRAMS) + $(RM) -rf torch/cmake-build-release @@ -63,4 +55,4 @@ endef $(foreach p,$(PROGRAMS),$(eval $(call COMPILE,$(p)))) -.PHONY: all clean default
\ No newline at end of file +.PHONY: all clean default torch diff --git a/tools/torch b/tools/torch new file mode 160000 +Subproject 74b0c120290083a5e3571a43deada72781af072 diff --git a/tools/torch/torch b/tools/torch/torch Binary files differdeleted file mode 100755 index e47357281..000000000 --- a/tools/torch/torch +++ /dev/null |