aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--XBMC.xcodeproj/project.pbxproj80
-rw-r--r--lib/librtmp/Makefile16
2 files changed, 29 insertions, 67 deletions
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index 1637906f07..b5e46c4070 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -9077,12 +9077,6 @@
lib/cpluff/libcpluff,
lib/libmicrohttpd/src/include,
"lib/libcurl-OSX/include",
- /opt/local/include,
- /opt/local/include/freetype2,
- /opt/local/include/mysql5,
- "/opt/local/include/glib-2.0",
- "/opt/local/lib/glib-2.0/include",
- /usr/X11R6/include,
);
INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist;
INSTALL_PATH = /usr/local/bin;
@@ -9095,27 +9089,23 @@
xbmc/lib/cmyth/librefmem,
xbmc/lib/libapetag/.libs,
xbmc/lib/libsquish,
+ xbmc/lib/libjsonrpc,
+ xbmc/lib/libhttpapi,
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs,
"lib/libSDL-OSX",
+ lib/jsoncpp/jsoncpp/src/lib_json,
+ lib/libmicrohttpd/src/daemon/.libs,
/opt/local/lib,
/opt/local/lib/mysql5/mysql,
/opt/local/lib/samba3,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/lib/jsoncpp/jsoncpp/src/lib_json\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/xbmc/lib/libjsonrpc\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/xbmc/lib/libhttpapi\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libmicrohttpd/src/daemon/.libs\"";
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
"-headerpad_max_install_names",
"-all_load",
);
PRODUCT_NAME = XBMC;
- USER_HEADER_SEARCH_PATHS = ". xbmc/cores/dvdplayer/Codecs/ffmpeg /usr/local/include";
+ USER_HEADER_SEARCH_PATHS = ". xbmc/cores/dvdplayer/Codecs/ffmpeg /opt/local/include /opt/local/include/freetype2 /opt/local/include/mysql5 /opt/local/include/glib-2.0 /opt/local/lib/glib-2.0/include /usr/X11R6/include";
ZERO_LINK = NO;
};
name = Debug;
@@ -9167,12 +9157,6 @@
lib/cpluff/libcpluff,
lib/libmicrohttpd/src/include,
"lib/libcurl-OSX/include",
- /opt/local/include,
- /opt/local/include/freetype2,
- /opt/local/include/mysql5,
- "/opt/local/include/glib-2.0",
- "/opt/local/lib/glib-2.0/include",
- /usr/X11R6/include,
);
INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist;
INSTALL_PATH = /usr/local/bin;
@@ -9185,27 +9169,23 @@
xbmc/lib/cmyth/librefmem,
xbmc/lib/libapetag/.libs,
xbmc/lib/libsquish,
+ xbmc/lib/libjsonrpc,
+ xbmc/lib/libhttpapi,
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs,
"lib/libSDL-OSX",
+ lib/jsoncpp/jsoncpp/src/lib_json,
+ lib/libmicrohttpd/src/daemon/.libs,
/opt/local/lib,
/opt/local/lib/mysql5/mysql,
/opt/local/lib/samba3,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/lib/jsoncpp/jsoncpp/src/lib_json\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/xbmc/lib/libjsonrpc\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/xbmc/lib/libhttpapi\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libmicrohttpd/src/daemon/.libs\"";
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
"-headerpad_max_install_names",
"-all_load",
);
PRODUCT_NAME = XBMC;
- USER_HEADER_SEARCH_PATHS = ". xbmc/cores/dvdplayer/Codecs/ffmpeg /usr/local/include";
+ USER_HEADER_SEARCH_PATHS = ". xbmc/cores/dvdplayer/Codecs/ffmpeg /opt/local/include /opt/local/include/freetype2 /opt/local/include/mysql5 /opt/local/include/glib-2.0 /opt/local/lib/glib-2.0/include /usr/X11R6/include";
ZERO_LINK = NO;
};
name = Release;
@@ -9314,12 +9294,6 @@
lib/cpluff/libcpluff,
lib/libmicrohttpd/src/include,
"lib/libcurl-OSX/include",
- /opt/local/include,
- /opt/local/include/freetype2,
- /opt/local/include/mysql5,
- "/opt/local/include/glib-2.0",
- "/opt/local/lib/glib-2.0/include",
- /usr/X11R6/include,
);
INFOPLIST_FILE = "/Users/Shared/xbmc/xbmc_svn/xbmc/osx/Info copy.plist";
INSTALL_PATH = /usr/local/bin;
@@ -9333,27 +9307,23 @@
xbmc/lib/cmyth/librefmem,
xbmc/lib/libapetag/.libs,
xbmc/lib/libsquish,
+ xbmc/lib/libjsonrpc,
+ xbmc/lib/libhttpapi,
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs,
"lib/libSDL-OSX",
+ lib/jsoncpp/jsoncpp/src/lib_json,
+ lib/libmicrohttpd/src/daemon/.libs,
/opt/local/lib,
/opt/local/lib/mysql5/mysql,
/opt/local/lib/samba3,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/lib/jsoncpp/jsoncpp/src/lib_json\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/xbmc/lib/libjsonrpc\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/xbmc/lib/libhttpapi\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libmicrohttpd/src/daemon/.libs\"";
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
"-headerpad_max_install_names",
"-all_load",
);
PRODUCT_NAME = XBMC;
- USER_HEADER_SEARCH_PATHS = ". xbmc/cores/dvdplayer/Codecs/ffmpeg /usr/local/include";
+ USER_HEADER_SEARCH_PATHS = ". xbmc/cores/dvdplayer/Codecs/ffmpeg /opt/local/include /opt/local/include/freetype2 /opt/local/include/mysql5 /opt/local/include/glib-2.0 /opt/local/lib/glib-2.0/include /usr/X11R6/include";
VALID_ARCHS = ppc;
ZERO_LINK = NO;
};
@@ -9406,12 +9376,6 @@
lib/cpluff/libcpluff,
lib/libmicrohttpd/src/include,
"lib/libcurl-OSX/include",
- /opt/local/include,
- /opt/local/include/freetype2,
- /opt/local/include/mysql5,
- "/opt/local/include/glib-2.0",
- "/opt/local/lib/glib-2.0/include",
- /usr/X11R6/include,
);
INFOPLIST_FILE = "/Users/Shared/xbmc/xbmc_svn/xbmc/osx/Info copy.plist";
INSTALL_PATH = /usr/local/bin;
@@ -9425,27 +9389,23 @@
xbmc/lib/cmyth/librefmem,
xbmc/lib/libapetag/.libs,
xbmc/lib/libsquish,
+ xbmc/lib/libjsonrpc,
+ xbmc/lib/libhttpapi,
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs,
"lib/libSDL-OSX",
+ lib/jsoncpp/jsoncpp/src/lib_json,
+ lib/libmicrohttpd/src/daemon/.libs,
/opt/local/lib,
/opt/local/lib/mysql5/mysql,
/opt/local/lib/samba3,
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
);
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/lib/jsoncpp/jsoncpp/src/lib_json\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/xbmc/lib/libjsonrpc\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/xbmc/lib/libhttpapi\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libmicrohttpd/src/daemon/.libs\"";
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
"-headerpad_max_install_names",
"-all_load",
);
PRODUCT_NAME = XBMC;
- USER_HEADER_SEARCH_PATHS = ". xbmc/cores/dvdplayer/Codecs/ffmpeg /usr/local/include";
+ USER_HEADER_SEARCH_PATHS = ". xbmc/cores/dvdplayer/Codecs/ffmpeg /opt/local/include /opt/local/include/freetype2 /opt/local/include/mysql5 /opt/local/include/glib-2.0 /opt/local/lib/glib-2.0/include /usr/X11R6/include";
VALID_ARCHS = ppc;
ZERO_LINK = NO;
};
diff --git a/lib/librtmp/Makefile b/lib/librtmp/Makefile
index ba6ed42eec..3c71112cef 100644
--- a/lib/librtmp/Makefile
+++ b/lib/librtmp/Makefile
@@ -21,12 +21,14 @@ RTMPDUMP_VERS = 511
OSTYPE = $(shell uname)
ifeq ($(OSTYPE),Darwin)
+PREFIX=/opt/local
XCFLAGS=-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-fPIC -I /opt/local/include
XLDFLAGS=-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-bundle -flat_namespace -undefined suppress -arch i386 -L/opt/local/lib \
-lpthread -lssl -lcrypto -lz
else
+PREFIX=/usr/local
XCFLAGS=-fPIC -DPIC
XLDFLAGS=-shared -fPIC -rdynamic -lpthread -lssl -lcrypto -lz
endif
@@ -49,12 +51,12 @@ librtmp/Makefile:
svn export --revision $(RTMPDUMP_VERS) svn://svn.mplayerhq.hu/rtmpdump/trunk/librtmp librtmp
install:
- mkdir -p /usr/local/lib
- mkdir -p /usr/local/include/librtmp
- cp -f librtmp/amf.h /usr/local/include/librtmp
- cp -f librtmp/log.h /usr/local/include/librtmp
- cp -f librtmp/rtmp.h /usr/local/include/librtmp
- cp -f librtmp.so /usr/local/lib/
+ mkdir -p $(PREFIX)/include/librtmp
+ cp -f librtmp/amf.h $(PREFIX)/include/librtmp
+ cp -f librtmp/log.h $(PREFIX)/include/librtmp
+ cp -f librtmp/http.h $(PREFIX)/include/librtmp
+ cp -f librtmp/rtmp.h $(PREFIX)/include/librtmp
+ cp -f librtmp.so $(PREFIX)/lib
clean:
rm -f librtmp.so
@@ -62,4 +64,4 @@ clean:
make -C librtmp clean
distclean::
- rm -rf librtmp.so includes librtmp
+ rm -rf librtmp.so librtmp
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-24 18:28:49 +0000