jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Full rewrite of all CMakeLists

Browse Source 
CMake now works on all platforms
This commit is contained in:
BtbN
2014-01-20 16:58:58 +01:00
parent 8fa309c96e
commit 45ec80fb7d
48 changed files with 2069 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libobs/obs-windows.c
View File

@@ -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;
}