Full rewrite of all CMakeLists

CMake now works on all platforms
2014-01-20 16:58:58 +01:00
parent 8fa309c96e
commit 45ec80fb7d
48 changed files with 2069 additions and 43 deletions
--- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt
@@ -0,0 +1,192 @@
+project(libobs)
+
+find_package(Libswresample REQUIRED)
+include_directories(${Libswresample_INCLUDE_DIR})
+add_definitions(${Libswresample_DEFINITIONS})
+
+find_package(Libavutil REQUIRED)
+include_directories(${Libavutil_INCLUDE_DIR})
+add_definitions(${Libavutil_DEFINITIONS})
+
+add_definitions(-DLIBOBS_EXPORTS)
+add_definitions(-DPTW32_STATIC_LIB)
+
+if(WIN32)
+	set(libobs_PLATFORM_SOURCES
+		obs-windows.c
+		util/platform-windows.c)
+	set(libobs_PLATFORM_DEPS
+		w32-pthreads)
+elseif(APPLE)
+	set(libobs_PLATFORM_SOURCES
+		obs-cocoa.c
+		util/platform-cocoa.m)
+
+	set_source_files_properties(${libobs_PLATFORM_SOURCES}
+		PROPERTIES
+			LANGUAGE C
+			COMPILE_FLAGS "-fobjc-arc")
+
+	find_library(COCOA Cocoa)
+	mark_as_advanced(COCOA)
+	include_directories(${COCOA})
+
+	set(libobs_PLATFORM_DEPS
+		${COCOA})
+elseif(UNIX)
+	set(libobs_PLATFORM_SOURCES
+		obs-nix.c
+		util/platform-nix.c)
+endif()
+
+if(MSVC)
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /EHc-")
+	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} /EHc-")
+endif()
+
+set(libobs_callback_SOURCES
+	callback/calldata.c
+	callback/signal.c
+	callback/proc.c)
+set(libobs_callback_HEADERS
+	callback/calldata.h
+	callback/proc.h
+	callback/signal.h)
+
+set(libobs_graphics_SOURCES
+	graphics/quat.c
+	graphics/effect-parser.c
+	graphics/axisang.c
+	graphics/vec4.c
+	graphics/vec2.c
+	graphics/texture-render.c
+	graphics/bounds.c
+	graphics/matrix3.c
+	graphics/matrix4.c
+	graphics/vec3.c
+	graphics/graphics.c
+	graphics/shader-parser.c
+	graphics/plane.c
+	graphics/effect.c
+	graphics/math-extra.c
+	graphics/graphics-imports.c)
+set(libobs_graphics_HEADERS
+	graphics/plane.h
+	graphics/quat.h
+	graphics/input.h
+	graphics/axisang.h
+	graphics/shader-parser.h
+	graphics/effect.h
+	graphics/math-defs.h
+	graphics/matrix4.h
+	graphics/graphics.h
+	graphics/graphics-internal.h
+	graphics/vec2.h
+	graphics/vec4.h
+	graphics/matrix3.h
+	graphics/vec3.h
+	graphics/math-extra.h
+	graphics/bounds.h
+	graphics/effect-parser.h)
+
+set(libobs_mediaio_SOURCES
+	media-io/video-io.c
+	media-io/audio-resampler-ffmpeg.c
+	media-io/format-conversion.c
+	media-io/audio-io.c)
+set(libobs_mediaio_HEADERS
+	media-io/format-conversion.h
+	media-io/video-io.h
+	media-io/audio-resampler.h
+	media-io/audio-io.h)
+
+set(libobs_util_SOURCES
+	util/base.c
+	util/platform.c
+	util/cf-lexer.c
+	util/bmem.c
+	util/config-file.c
+	util/lexer.c
+	util/dstr.c
+	util/utf8.c
+	util/text-lookup.c
+	util/cf-parser.c)
+set(libobs_util_HEADERS
+	util/utf8.h
+	util/base.h
+	util/text-lookup.h
+	util/vc/vc_inttypes.h
+	util/vc/vc_stdbool.h
+	util/vc/vc_stdint.h
+	util/bmem.h
+	util/c99defs.h
+	util/cf-parser.h
+	util/threading.h
+	util/cf-lexer.h
+	util/darray.h
+	util/circlebuf.h
+	util/dstr.h
+	util/serializer.h
+	util/config-file.h
+	util/lexer.h
+	util/platform.h)
+
+set(libobs_libobs_SOURCES
+	${libobs_PLATFORM_SOURCES}
+	obs-encoder.c
+	obs-source.c
+	obs-output.c
+	obs.c
+	obs-module.c
+	obs-display.c
+	obs-scene.c
+	obs-video.c)
+set(libobs_libobs_HEADERS
+	obs-defs.h
+	obs-encoder.h
+	obs-service.h
+	obs-data.h
+	obs.h
+	obs-module.h
+	obs-scene.h
+	obs-source.h
+	obs-output.h)
+
+set(libobs_SOURCES
+	${libobs_callback_SOURCES}
+	${libobs_graphics_SOURCES}
+	${libobs_mediaio_SOURCES}
+	${libobs_util_SOURCES}
+	${libobs_libobs_SOURCES})
+
+set(libobs_HEADERS
+	${libobs_callback_HEADERS}
+	${libobs_graphics_HEADERS}
+	${libobs_mediaio_HEADERS}
+	${libobs_util_HEADERS}
+	${libobs_libobs_HEADERS})
+
+source_group("callback\\Source Files" FILES ${libobs_callback_SOURCES})
+source_group("callback\\Header Files" FILES ${libobs_callback_HEADERS})
+source_group("graphics\\Source Files" FILES ${libobs_graphics_SOURCES})
+source_group("graphics\\Header Files" FILES ${libobs_graphics_HEADERS})
+source_group("libobs\\Source Files" FILES ${libobs_libobs_SOURCES})
+source_group("libobs\\Header Files" FILES ${libobs_libobs_HEADERS})
+source_group("media-io\\Source Files" FILES ${libobs_mediaio_SOURCES})
+source_group("media-io\\Header Files" FILES ${libobs_mediaio_HEADERS})
+source_group("util\\Source Files" FILES ${libobs_util_SOURCES})
+source_group("util\\Header Files" FILES ${libobs_util_HEADERS})
+
+add_library(libobs SHARED ${libobs_SOURCES} ${libobs_HEADERS})
+set_target_properties(libobs PROPERTIES
+	OUTPUT_NAME obs
+	VERSION "0"
+	SOVERSION "0")
+target_link_libraries(libobs
+	${libobs_PLATFORM_DEPS}
+	${Libswresample_LIBRARIES}
+	${Libavutil_LIBRARIES})
+
+install_obs_core(libobs)
+install_obs_data(libobs ../build/data/libobs libobs)
--- a/libobs/obs-cocoa.c
+++ b/libobs/obs-cocoa.c
@@ -24,8 +24,8 @@

 // support both foo.so and libfoo.so for now
 static const char *plugin_patterns[] = {
-	"../plugins/%s.so",
-	"../plugins/lib%s.so"
+	OBS_INSTALL_PREFIX "obs-plugins/%s.so",
+	OBS_INSTALL_PREFIX "obs-plugins/lib%s.so"
 };

 static const int plugin_patterns_size =
@@ -47,7 +47,7 @@ char *find_plugin(const char *plugin)
 char *find_libobs_data_file(const char *file)
 {
 	struct dstr path;
-	dstr_init_copy(&path, "../data/libobs/");
+	dstr_init_copy(&path, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/");
 	dstr_cat(&path, file);
 	return path.array;
 }
@@ -55,7 +55,7 @@ char *find_libobs_data_file(const char *file)
 char *obs_find_plugin_file(const char *file)
 {
 	struct dstr path;
-	dstr_init_copy(&path, "../data/obs-plugins/");
+	dstr_init_copy(&path, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/");
 	dstr_cat(&path, file);
 	return path.array;
 }
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
@@ -56,10 +56,10 @@ char *find_plugin(const char *plugin)
 	struct dstr output;
 	dstr_init(&output);

-	if (check_lib_path(plugin, "/usr/local/lib/obs-plugins/", &output))
+	if (check_lib_path(plugin, "obs-plugins/", &output))
 		return output.array;

-	if (check_lib_path(plugin, "/usr/lib/obs-plugins/", &output))
+	if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins", &output))
 		return output.array;

 	dstr_free(&output);
@@ -75,10 +75,10 @@ char *find_libobs_data_file(const char *file)
 	struct dstr output;
 		dstr_init(&output);

-	if (check_path(file, "/usr/local/share/libobs/", &output))
+	if (check_path(file, OBS_DATA_PATH "/libobs/", &output))
 		return output.array;

-	if (check_path(file, "/usr/share/libobs/", &output))
+	if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/", &output))
 		return output.array;

 	dstr_free(&output);
@@ -94,10 +94,10 @@ char *obs_find_plugin_file(const char *file)
    struct dstr output;
    dstr_init(&output);

-    if (check_path(file, "/usr/local/share/obs-plugins/", &output))
+    if (check_path(file, OBS_DATA_PATH "/obs-plugins/", &output))
        return output.array;

-    if (check_path(file, "/usr/share/obs-plugins", &output))
+    if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/", &output))
        return output.array;

    dstr_free(&output);
--- a/libobs/obs-windows.c
+++ b/libobs/obs-windows.c
@@ -24,11 +24,7 @@
 char *find_plugin(const char *plugin)
 {
 	struct dstr path;
-#ifdef _WIN64
-	dstr_init_copy(&path, "../../plugins/64bit/");
-#else
-	dstr_init_copy(&path, "../../plugins/32bit/");
-#endif
+	dstr_init_copy(&path, OBS_INSTALL_PREFIX "obs-plugins/");
 	dstr_cat(&path, plugin);
 	return path.array;
 }
@@ -37,7 +33,7 @@ char *find_plugin(const char *plugin)
 char *find_libobs_data_file(const char *file)
 {
 	struct dstr path;
-	dstr_init_copy(&path, "../../data/libobs/");
+	dstr_init_copy(&path, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/");
 	dstr_cat(&path, file);
 	return path.array;
 }
@@ -46,7 +42,7 @@ char *find_libobs_data_file(const char *file)
 char *obs_find_plugin_file(const char *file)
 {
 	struct dstr path;
-	dstr_init_copy(&path, "../../data/obs-plugins/");
+	dstr_init_copy(&path, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/");
 	dstr_cat(&path, file);
 	return path.array;
 }
--- a/libobs/util/c99defs.h
+++ b/libobs/util/c99defs.h
@@ -36,9 +36,9 @@
 #define inline __inline
 #endif

-#define EXPORT extern __declspec(dllexport)
+#define EXPORT __declspec(dllexport)
 #else
-#define EXPORT extern
+#define EXPORT
 #endif

 #if _MSC_VER && _MSC_VER < 0x0708
@@ -67,3 +67,11 @@ typedef int64_t off64_t;
 #define SIZE_T_FORMAT "%zu"

 #endif /* _MSC_VER */
+
+#ifndef OBS_DATA_PATH
+#define OBS_DATA_PATH "data"
+#endif
+
+#ifndef OBS_INSTALL_PREFIX
+#define OBS_INSTALL_PREFIX ""
+#endif
--- a/libobs/util/platform-windows.c
+++ b/libobs/util/platform-windows.c
@@ -147,7 +147,7 @@ char *os_get_config_path(const char *name)

 bool os_file_exists(const char *path)
 {
-	WIN32_FIND_DATA wfd;
+	WIN32_FIND_DATAW wfd;
 	HANDLE hFind;
 	wchar_t *path_utf16;