Merge branch 'main' of https://github.com/discordnova/Nova

1 files changed, 1 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 28c8738..a2dd621 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,3 @@
-ifeq ($(OS),Windows_NT)
-	detected_OS := Windows
-else
-	detected_OS := $(shell uname -s)
-endif
-
 # Creates the bin folder for build artifacts
 build/{bin,lib}:
 	@mkdir -p build/{lib,bin}
@@ -15,12 +9,6 @@ build/lib/liball_in_one.a build/bin/{cache,gateway,ratelimit,rest,webhook}{,.exe
 	@cp target/release/liball_in_one.a build/lib
 	@cp target/release/{cache,gateway,ratelimit,rest,webhook}{,.exe} build/bin
 
-build/lib/liball_in_one.a build/bin/{cache,gateway,ratelimit,rest,webhook}: build/{bin,lib}
-	@echo "Building rust project"
-	cargo build --release
-	@cp target/release/liball_in_one.a build/lib
-	@cp target/release/{cache,gateway,ratelimit,rest,webhook} build/bin
-
 # Generated by a rust build script.
 internal/pkg/all-in-one/all-in-one.h: build/lib/liball_in_one.a
 
@@ -28,16 +16,7 @@ internal/pkg/all-in-one/all-in-one.h: build/lib/liball_in_one.a
 build/bin/nova: build/lib/liball_in_one.a internal/pkg/all-in-one/all-in-one.h
 	go build -a -ldflags '-s' -o build/bin/nova cmd/nova/nova.go
 
-all: 
-	ifeq ($(detected_OS),Windows)
-		build/bin/{cache,gateway,ratelimit,rest,webhook}{,.exe} build/bin/nova
-	endif
-	ifeq ($(detected_OS),Linux)
-		build/bin/{cache,gateway,ratelimit,rest,webhook} build/bin/nova
-	endif
-	ifeq ($(detected_OS),Darwin)
-		build/bin/{cache,gateway,ratelimit,rest,webhook} build/bin/nova
-	endif
+all: build/bin/{cache,gateway,ratelimit,rest,webhook}{,.exe} build/bin/nova
 
 docker-images:
 	docker-compose build