archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

commiting ettore fourth patch (plugin path)

Browse Source
This commit is contained in:
JLuc Peuriere
2007-07-18 21:16:07 +00:00
parent 603da178b9
commit 256de79f51
3 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/BLI_blenlib.h
View File

@@ -247,6 +247,7 @@ void BLI_free_file_lines(struct LinkNode *lines);
*/
void BLI_where_am_i(char *fullname, char *name);
char *get_install_dir(void);
/**
* determines the full path to the application bundle on OS X
*

2
source/blender/blenloader/intern/writefile.c
View File

@@ -1981,7 +1981,7 @@ int BLO_write_file_mem(MemFile *compare, MemFile *current, int write_flags, char
#define PATHSEPERATOR "/"
#endif
static char *get_install_dir(void) {
char *get_install_dir(void) {
extern char bprogname[];
char *tmpname = BLI_strdup(bprogname);
char *cut;

56
source/blender/src/ghostwinlay.c
View File

@@ -889,21 +889,53 @@ Window *winlay_get_active_window(void) {
return active_gl_window;
}
#ifdef _WIN32
#define PATH_SEP "\\"
#else
#define PATH_SEP "/"
#endif
void window_open_ndof(Window* win)
{
PILdynlib* ndofLib = PIL_dynlib_open("XXXXXXX-PUT-HERE-YOUR-PATH-TO-THE-PLUG--/spaceplug.plug");
if (ndofLib) {
GHOST_OpenNDOF(g_system, win->ghostwin,
PIL_dynlib_find_symbol(ndofLib, "ndofInit"),
PIL_dynlib_find_symbol(ndofLib, "ndofShutdown"),
PIL_dynlib_find_symbol(ndofLib, "ndofOpen"));
// original patch only
// PIL_dynlib_find_symbol(ndofLib, "ndofEventHandler"));
}
char *inst_path, *plug_path;
const char *plug_dir = "plugins";
const char *plug_name = "3DxNdofBlender.plug";
PILdynlib *ndofLib;
// build the plugin path
plug_path = NULL;
inst_path = get_install_dir(); // path to main blender exec/bundle
if (inst_path) {
// assume the ndof plugin is located in the plug-in dir
size_t len = strlen(inst_path) + strlen(plug_dir) + strlen(PATH_SEP)*2
+ strlen(plug_name) + 1;
plug_path = MEM_mallocN(len, "ndofpluginpath");
if (plug_path) {
strncpy(plug_path, inst_path, len);
strcat(plug_path, PATH_SEP);
strcat(plug_path, plug_dir);
strcat(plug_path, PATH_SEP);
strcat(plug_path, plug_name);
}
MEM_freeN(inst_path);
}
ndofLib = PIL_dynlib_open(plug_path);
#if 0
fprintf(stderr, "plugin path=%s; ndofLib=%p\n", plug_path, (void*)ndofLib);
#endif
if (plug_path)
MEM_freeN(plug_path);
if (ndofLib) {
GHOST_OpenNDOF(g_system, win->ghostwin,
PIL_dynlib_find_symbol(ndofLib, "ndofInit"),
PIL_dynlib_find_symbol(ndofLib, "ndofShutdown"),
PIL_dynlib_find_symbol(ndofLib, "ndofOpen"));
}
else {
// GHOST_OpenNDOF(g_system, win->ghostwin, 0, 0, 0, 0);
GHOST_OpenNDOF(g_system, win->ghostwin, 0, 0, 0);
}
}