diff --git a/bin/osx/gsplus b/bin/osx/gsplus index 487c785..22db294 100755 Binary files a/bin/osx/gsplus and b/bin/osx/gsplus differ diff --git a/src/Makefile b/src/Makefile index 636be7d..aa23f35 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,5 @@ # GSport central makefile - you need a 'vars' file linked/copied from a 'vars_xxx' template to build. +#@todo: check for vars file and do something useful if missing :P OBJECTS1 = adb.o clock.o config.o dis.o engine_c.o scc.o iwm.o \ joystick_driver.o moremem.o paddles.o parallel.o printer.o \ @@ -62,7 +63,7 @@ gsportmac: $(OBJECTS) compile_time.o # OSX builds gsplus: $(OBJECTS) compile_time.o - $(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) + $(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) echo $(OBJECTS) cp gsplus .. cp gsplus ../bin/osx diff --git a/src/vars_osx b/src/vars_osx index f2e9867..1166564 100644 --- a/src/vars_osx +++ b/src/vars_osx @@ -9,7 +9,7 @@ OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) osxdriver.o sdlsnd_driver2.o #CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 -g #CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2 #EXTRA_LIBS = -lfreetype -lSDL2 -CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -g -I/usr/local/include/freetype2 +CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2 EXTRA_LIBS = -lSDL2 -lfreetype OPTS = -DGSPORT_LITTLE_ENDIAN