# HG changeset patch
# User koda
# Date 1353717046 -3600
# Node ID 257ffa847aa29e370c77047d19da1dd623e0f684
# Parent  329d9756b57c79bc00ef4cadbac95e3cd6a4696f
physfs: no carbon depency on osx, add cdecl attributes on extra functions

diff -r 329d9756b57c -r 257ffa847aa2 misc/physfs/CMakeLists.txt
--- a/misc/physfs/CMakeLists.txt	Sat Nov 24 00:28:32 2012 +0400
+++ b/misc/physfs/CMakeLists.txt	Sat Nov 24 01:30:46 2012 +0100
@@ -47,7 +47,7 @@
 
     # Need these everywhere...
     ADD_DEFINITIONS(-fno-common)
-    SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} "-framework Carbon -framework IOKit")
+    SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} "-framework IOKit")
 ENDIF(MACOSX)
 
 # Add some gcc-specific command lines.
diff -r 329d9756b57c -r 257ffa847aa2 misc/physfs/extras/hwpacksmounter.c
--- a/misc/physfs/extras/hwpacksmounter.c	Sat Nov 24 00:28:32 2012 +0400
+++ b/misc/physfs/extras/hwpacksmounter.c	Sat Nov 24 01:30:46 2012 +0100
@@ -1,11 +1,10 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "physfs.h"
 
 #include "hwpacksmounter.h"
 
-void hedgewarsMountPackages()
+PHYSFS_DECL void hedgewarsMountPackages()
 {
     char ** filesList = PHYSFS_enumerateFiles("/");
     char **i;
diff -r 329d9756b57c -r 257ffa847aa2 misc/physfs/extras/hwpacksmounter.h
--- a/misc/physfs/extras/hwpacksmounter.h	Sat Nov 24 00:28:32 2012 +0400
+++ b/misc/physfs/extras/hwpacksmounter.h	Sat Nov 24 01:30:46 2012 +0100
@@ -1,11 +1,13 @@
 #ifndef HEDGEWARS_PACKAGES_MOUNTER_H
 #define HEDGEWARS_PACKAGES_MOUNTER_H
 
+#include "physfs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void hedgewarsMountPackages();
+PHYSFS_DECL void hedgewarsMountPackages();
 
 
 #ifdef __cplusplus
diff -r 329d9756b57c -r 257ffa847aa2 misc/physfs/extras/physfslualoader.c
--- a/misc/physfs/extras/physfslualoader.c	Sat Nov 24 00:28:32 2012 +0400
+++ b/misc/physfs/extras/physfslualoader.c	Sat Nov 24 01:30:46 2012 +0100
@@ -5,7 +5,7 @@
 
 void *physfsReaderBuffer;
 
-const char * physfsReader(lua_State *L, PHYSFS_File *f, size_t *size)
+PHYSFS_DECL const char * physfsReader(lua_State *L, PHYSFS_File *f, size_t *size)
 {
 
     if(PHYSFS_eof(f))
@@ -23,7 +23,7 @@
     }
 }
 
-void physfsReaderSetBuffer(void *buffer)
+PHYSFS_DECL void physfsReaderSetBuffer(void *buffer)
 {
     physfsReaderBuffer = buffer;
 }