diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c7c1485..5f66128 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,7 +13,5 @@ jobs: steps: - uses: actions/checkout@v3 - - name: silicon-binaries - run: git clone https://github.com/ColleagueRiley/Silicon -b binaries && cp Silicon/ARM/*.o deps/Silicon/source - name: make run: make diff --git a/Makefile b/Makefile index 36c7b55..ed7cdd7 100644 --- a/Makefile +++ b/Makefile @@ -8,24 +8,21 @@ else endif ifeq ($(detected_OS),Windows) - LIBS := -lopengl32 -lshell32 -lgdi32 -lm + LIBS := -lopengl32 -lshell32 -lgdi32 EXT = dll endif ifeq ($(detected_OS),Darwin) # Mac OS X - LIBS := ./deps/Silicon/source/*.o -lm -framework Foundation -framework AppKit -framework OpenGL -framework CoreVideo + LIBS := -framework Foundation -framework AppKit -framework OpenGL -framework CoreVideo EXT = dylib endif ifeq ($(detected_OS),Linux) - LIBS := -I./include -lX11 -lGLX -lm + LIBS := -lX11 -lGLX EXT = so endif all: - @if [ $(shell uname) = Darwin ]; then\ - make deps/Silicon/source/mac.o;\ - fi make RSGL.o - gcc RSGL.o -shared -O3 -I./include $(LIBS) -o libRSGL.$(EXT) + gcc RSGL.o -shared -O3 $(LIBS) -lm -o libRSGL.$(EXT) ar rcs libRSGL.a *.o RSGL.o: @@ -36,9 +33,6 @@ RSGL.o: clean: rm libRSGL.so RSGL.o libRSGL.a -deps/Silicon/source/mac.o: - cd deps/Silicon/source/ && gcc -c *.m -I../ - install: sudo cp libRSGL.so /usr/lib sudo cp libRSGL.a /usr/local/lib