gistfile1.txt

Index: src/burner/ioapi.c
===================================================================
--- src/burner/ioapi.c	(revision 395)
+++ src/burner/ioapi.c	(working copy)
@@ -14,6 +14,12 @@
         #define _CRT_SECURE_NO_WARNINGS
 #endif
 
+#if defined(__APPLE__)
+#define fopen64 fopen
+#define ftello64 ftell
+#define fseeko64 fseek
+#endif
+
 #include "ioapi.h"
 
 voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
Index: src/burner/libsnes/generate_files.sh
===================================================================
--- src/burner/libsnes/generate_files.sh	(revision 395)
+++ src/burner/libsnes/generate_files.sh	(working copy)
@@ -5,7 +5,7 @@
    exit 0
 fi
 
-cd ../../src
+cd ../..
 mkdir -p generated
 
 #generate gamelist.txt and generated/driverlist.h
Index: makefile.libsnes
===================================================================
--- makefile.libsnes	(revision 395)
+++ makefile.libsnes	(working copy)
@@ -1,4 +1,4 @@
-DEBUG=0
+DEBUG = 0
 
 ifeq ($(platform),)
 platform = unix
@@ -11,10 +11,19 @@
 endif
 endif
 
+MAIN_FBA_DIR := src
+FBA_BURN_DIR := $(MAIN_FBA_DIR)/burn
+FBA_BURN_DRIVERS_DIR := $(MAIN_FBA_DIR)/burn/drv
+FBA_BURNER_DIR := $(MAIN_FBA_DIR)/burner
+LIBSNES_DIR := $(FBA_BURNER_DIR)/libsnes
+FBA_CPU_DIR := $(MAIN_FBA_DIR)/cpu
+FBA_LIB_DIR := $(MAIN_FBA_DIR)/dep/libs
+FBA_INTERFACE_DIR := $(MAIN_FBA_DIR)/intf
+
 ifeq ($(platform), unix)
    TARGET := libsnes.so
    fpic := -fPIC
-   SHARED := -shared -Wl,-no-undefined
+   SHARED := -shared -Wl,-no-undefined -Wl,--version-script=$(LIBSNES_DIR)/link.T
    ENDIANNESS_DEFINES := -DLSB_FIRST
 else ifeq ($(platform), osx)
    TARGET := libsnes.dylib
@@ -23,7 +32,6 @@
    ENDIANNESS_DEFINES := -DLSB_FIRST
 else ifeq ($(platform), ps3)
    TARGET := libsnes.a
-   SHARED := -shared, -Wl, --version-script=libsnes/link.T
    CC = ppu-lv2-gcc
    CXX = ppu-lv2-g++
    AR = ppu-lv2-ar
@@ -47,22 +55,13 @@
    TARGET := snes.dll
    CC = gcc
    CXX = g++
-   SHARED := -shared -Wl,-no-undefined
+   SHARED := -shared -Wl,-no-undefined -Wl,--version-script=$(LIBSNES_DIR)/link.T
    LDFLAGS += -static-libgcc -static-libstdc++
    ENDIANNESS_DEFINES := -DLSB_FIRST
 endif
 
 all: $(TARGET)
 
-MAIN_FBA_DIR := src
-FBA_BURN_DIR := $(MAIN_FBA_DIR)/burn
-FBA_BURN_DRIVERS_DIR := $(MAIN_FBA_DIR)/burn/drv
-FBA_BURNER_DIR := $(MAIN_FBA_DIR)/burner
-LIBSNES_DIR := $(FBA_BURNER_DIR)/libsnes
-FBA_CPU_DIR := $(MAIN_FBA_DIR)/cpu
-FBA_LIB_DIR := $(MAIN_FBA_DIR)/dep/libs
-FBA_INTERFACE_DIR := $(MAIN_FBA_DIR)/intf
-
 BURN_BLACKLIST := $(FBA_BURN_DIR)/zet_c68k.cpp \
 	$(FBA_BURN_DIR)/sek_c68k.cpp \
 	$(FBA_BURNER_DIR)/un7z.cpp \
@@ -174,7 +173,7 @@
 
 CFLAGS += -std=gnu99 $(fpic) -Wno-write-strings $(FBA_DEFINES)
 CXXFLAGS += $(fpic) -Wno-write-strings $(FBA_DEFINES)
-LDFLAGS += -Wl,-no-undefined $(fpic) -Wl,--version-script=$(LIBSNES_DIR)/link.T
+LDFLAGS += $(fpic)
 
 INCDIRS := -I$(FBA_BURNER_DIR)/win32 \
 	-I$(LIBSNES_DIR) \