From 93d15ef254f66a16dee81e4e5962cd99f0e2cec4 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 25 Jan 2014 12:34:37 -0700 Subject: [PATCH] Fix some formatting issues and fix cmake file --- cmake/Modules/ObsHelpers.cmake | 4 ++-- libobs/obs-cocoa.c | 4 ++-- libobs/obs-nix.c | 9 +++++---- libobs/util/c99defs.h | 2 ++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index 1b312ad65..6b882bf18 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -24,8 +24,8 @@ if(NOT UNIX_STRUCTURE) set(OBS_EXECUTABLE32_DESTINATION "bin/32bit") set(OBS_EXECUTABLE64_DESTINATION "bin/64bit") set(OBS_LIBRARY_DESTINATION "bin/${_lib_suffix}bit") - set(OBS_LIBRARY32_DESTINATION "lib32") - set(OBS_LIBRARY64_DESTINATION "lib64") + set(OBS_LIBRARY32_DESTINATION "bin/32bit") + set(OBS_LIBRARY64_DESTINATION "bin/64bit") set(OBS_PLUGIN_DESTINATION "obs-plugins/${_lib_suffix}bit") set(OBS_PLUGIN32_DESTINATION "obs-plugins/32bit") set(OBS_PLUGIN64_DESTINATION "obs-plugins/64bit") diff --git a/libobs/obs-cocoa.c b/libobs/obs-cocoa.c index 4a84fb96d..94164a1df 100644 --- a/libobs/obs-cocoa.c +++ b/libobs/obs-cocoa.c @@ -49,7 +49,7 @@ char *find_plugin(const char *plugin) char *find_libobs_data_file(const char *file) { struct dstr path; - dstr_init_copy(&path, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/"); + dstr_init_copy(&path, OBS_INSTALL_DATA_PATH "/libobs/"); dstr_cat(&path, file); return path.array; } @@ -57,7 +57,7 @@ char *find_libobs_data_file(const char *file) char *obs_find_plugin_file(const char *file) { struct dstr path; - dstr_init_copy(&path, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/"); + dstr_init_copy(&path, OBS_INSTALL_DATA_PATH "/obs-plugins/"); dstr_cat(&path, file); return path.array; } diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c index c6927e323..c5b69ae5b 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c @@ -66,7 +66,8 @@ char *find_plugin(const char *plugin) if (OBS_INSTALL_PREFIX [0] != 0) { - if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins/", + if (check_lib_path(plugin, + OBS_INSTALL_PREFIX "lib/obs-plugins/", &output)) return output.array; } @@ -89,7 +90,7 @@ char *find_libobs_data_file(const char *file) if (OBS_INSTALL_PREFIX [0] != 0) { - if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/", + if (check_path(file, OBS_INSTALL_DATA_PATH "/libobs/", &output)) return output.array; } @@ -112,8 +113,8 @@ char *obs_find_plugin_file(const char *file) if (OBS_INSTALL_PREFIX [0] != 0) { - if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/", - &output)) + if (check_path(file, OBS_INSTALL_DATA_PATH "/obs-plugins/", + &output)) return output.array; } diff --git a/libobs/util/c99defs.h b/libobs/util/c99defs.h index c68a7c831..4ab7dab1a 100644 --- a/libobs/util/c99defs.h +++ b/libobs/util/c99defs.h @@ -75,3 +75,5 @@ typedef int64_t off64_t; #ifndef OBS_INSTALL_PREFIX #define OBS_INSTALL_PREFIX "" #endif + +#define OBS_INSTALL_DATA_PATH OBS_INSTALL_PREFIX OBS_DATA_PATH