diff --git a/Makefile b/Makefile index c757ac43..ea2480aa 100644 --- a/Makefile +++ b/Makefile @@ -474,11 +474,11 @@ ifeq ($(PLATFORM),darwin) # We copy sdlmain before ranlib'ing it so that subversion doesn't think # the file has been modified by each build. - LIBSDLMAIN=$(B)/libSDLmain.a - LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a + LIBSDLMAIN=$(B)/libSDL2main.a + LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDL2main.a CLIENT_LIBS += -framework IOKit \ - $(LIBSDIR)/macosx/libSDL-1.2.0.dylib - RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL-1.2.0.dylib + $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib + RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib OPTIMIZEVM += -falign-loops=16 OPTIMIZE = $(OPTIMIZEVM) -ffast-math diff --git a/code/libs/macosx/libSDL2-2.0.0.dylib b/code/libs/macosx/libSDL2-2.0.0.dylib index 9fe6320b..20baaa65 100755 Binary files a/code/libs/macosx/libSDL2-2.0.0.dylib and b/code/libs/macosx/libSDL2-2.0.0.dylib differ diff --git a/code/libs/macosx/libSDL2main.a b/code/libs/macosx/libSDL2main.a index 687fceda..514a169f 100644 Binary files a/code/libs/macosx/libSDL2main.a and b/code/libs/macosx/libSDL2main.a differ