Browse Source

added OSX files to automake scripts

jp9000 12 years ago
parent
commit
e778a4c04f
3 changed files with 12 additions and 3 deletions
  1. 5 0
      libobs-opengl/makefile.am
  2. 4 0
      libobs/makefile.am
  3. 3 3
      libobs/obs-cocoa.c

+ 5 - 0
libobs-opengl/makefile.am

@@ -30,6 +30,11 @@ libobs_opengl_la_SOURCES = gl-helpers.c \
 			   gl-vertexbuffer.c \
 			   gl-zstencil.c \
 			   glew/src/glew.c
+
+if OS_OSX
+libobs_opengl_la_SOURCES += gl-cocoa.m
+endif
+
 if OS_WIN
 libobs_opengl_la_SOURCES += gl-windows.c
 endif

+ 4 - 0
libobs/makefile.am

@@ -58,6 +58,10 @@ if OS_WIN
 libobs_la_SOURCES += util/platform-windows.c obs-windows.c
 endif
 
+if OS_OSX
+libobs_la_SOURCES += util/platform-cocoa.c obs-cocoa.c
+endif
+
 if OS_NIX
 libobs_la_SOURCES += util/platform-nix.c obs-nix.c
 endif

+ 3 - 3
libobs/obs-cocoa.c

@@ -27,7 +27,9 @@ static const char *plugin_patterns[] = {
 	"../plugins/%s.so",
 	"../plugins/lib%s.so"
 };
-static const int plugin_patterns_size = sizeof(plugin_patterns)/sizeof(plugin_patterns[0]);
+
+static const int plugin_patterns_size =
+	sizeof(plugin_patterns)/sizeof(plugin_patterns[0]);
 
 char *find_plugin(const char *plugin)
 {
@@ -42,7 +44,6 @@ char *find_plugin(const char *plugin)
 	return path.array;
 }
 
-/* on windows, points to [base directory]/libobs */
 char *find_libobs_data_file(const char *file)
 {
 	struct dstr path;
@@ -51,7 +52,6 @@ char *find_libobs_data_file(const char *file)
 	return path.array;
 }
 
-/* on windows, data files should always be in [base directory]/data */
 char *obs_find_plugin_file(const char *file)
 {
 	struct dstr path;