diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index 1856710ff..db55cff12 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -42,7 +42,9 @@ if(NOT UNIX_STRUCTURE) set(OBS_PLUGIN_DESTINATION "obs-plugins") set(OBS_PLUGIN32_DESTINATION "obs-plugins") set(OBS_PLUGIN64_DESTINATION "obs-plugins") - add_definitions(-DOBS_DATA_PATH="../${OBS_DATA_DESTINATION}") + + set(OBS_DATA_PATH "../${OBS_DATA_DESTINATION}") + set(OBS_INSTALL_PREFIX "") else() set(OBS_EXECUTABLE_DESTINATION "bin/${_lib_suffix}bit") set(OBS_EXECUTABLE32_DESTINATION "bin/32bit") @@ -53,7 +55,9 @@ if(NOT UNIX_STRUCTURE) set(OBS_PLUGIN_DESTINATION "obs-plugins/${_lib_suffix}bit") set(OBS_PLUGIN32_DESTINATION "obs-plugins/32bit") set(OBS_PLUGIN64_DESTINATION "obs-plugins/64bit") - add_definitions(-DOBS_DATA_PATH="../../${OBS_DATA_DESTINATION}") + + set(OBS_DATA_PATH "../../${OBS_DATA_DESTINATION}") + set(OBS_INSTALL_PREFIX "") endif() set(OBS_CMAKE_DESTINATION "cmake") set(OBS_INCLUDE_DESTINATION "include") @@ -70,8 +74,9 @@ else() set(OBS_DATA_DESTINATION "share/obs") set(OBS_CMAKE_DESTINATION "lib/cmake") set(OBS_INCLUDE_DESTINATION "include/obs") - add_definitions(-DOBS_DATA_PATH="${OBS_DATA_DESTINATION}") - add_definitions(-DOBS_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}/") + + set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") + set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") endif() function(obs_finish_bundle) diff --git a/libobs/obs-config.h b/libobs/obs-config.h index c9af513ac..071417c5d 100644 --- a/libobs/obs-config.h +++ b/libobs/obs-config.h @@ -56,7 +56,9 @@ #ifdef HAVE_OBSCONFIG_H # include "obsconfig.h" #else - -#define OBS_VERSION "unknown" - +# define OBS_VERSION "unknown" +# define OBS_DATA_PATH "../../data" +# define OBS_INSTALL_PREFIX "" #endif + +#define OBS_INSTALL_DATA_PATH OBS_INSTALL_PREFIX OBS_DATA_PATH diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in index a55dbc5c6..d227d291d 100644 --- a/libobs/obsconfig.h.in +++ b/libobs/obsconfig.h.in @@ -2,4 +2,5 @@ #pragma once #define OBS_VERSION "@OBS_VERSION@" - +#define OBS_DATA_PATH "@OBS_DATA_PATH@" +#define OBS_INSTALL_PREFIX "@OBS_INSTALL_PREFIX@" diff --git a/libobs/util/c99defs.h b/libobs/util/c99defs.h index fe72f83cd..3babdeea4 100644 --- a/libobs/util/c99defs.h +++ b/libobs/util/c99defs.h @@ -76,13 +76,3 @@ 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 - -#define OBS_INSTALL_DATA_PATH OBS_INSTALL_PREFIX OBS_DATA_PATH diff --git a/obs/platform-osx.mm b/obs/platform-osx.mm index ee781cf47..a230cd99a 100644 --- a/obs/platform-osx.mm +++ b/obs/platform-osx.mm @@ -17,6 +17,7 @@ #include #include +#include #include "platform.hpp" #include "obs-app.hpp" diff --git a/obs/platform-windows.cpp b/obs/platform-windows.cpp index 3168840b6..5686a1966 100644 --- a/obs/platform-windows.cpp +++ b/obs/platform-windows.cpp @@ -17,6 +17,7 @@ #include #include +#include "obs-config.h" #include "obs-app.hpp" #include "platform.hpp" using namespace std; diff --git a/obs/platform-x11.cpp b/obs/platform-x11.cpp index ea834cca4..715f5073b 100644 --- a/obs/platform-x11.cpp +++ b/obs/platform-x11.cpp @@ -20,6 +20,7 @@ * Even if there are not multiple monitors, this should still work. */ +#include #include "obs-app.hpp" #include