Revision: 76411
http://sourceforge.net/p/brlcad/code/76411
Author: starseeker
Date: 2020-07-22 12:50:10 +0000 (Wed, 22 Jul 2020)
Log Message:
-----------
There we go, get the remaining adjustments made to avoid colliding with libged
wrapping names.
Modified Paths:
--------------
brlcad/branches/gedplugins/src/libged/nmg/nmg.c
brlcad/branches/gedplugins/src/libged/nmg/nmg_cmface.c
brlcad/branches/gedplugins/src/libged/nmg/nmg_collapse.c
brlcad/branches/gedplugins/src/libged/nmg/nmg_fix_normals.c
brlcad/branches/gedplugins/src/libged/nmg/nmg_kill_f.c
brlcad/branches/gedplugins/src/libged/nmg/nmg_kill_v.c
brlcad/branches/gedplugins/src/libged/nmg/nmg_make_v.c
brlcad/branches/gedplugins/src/libged/nmg/nmg_mm.c
brlcad/branches/gedplugins/src/libged/nmg/nmg_move_v.c
brlcad/branches/gedplugins/src/libged/nmg/nmg_simplify.c
brlcad/branches/gedplugins/src/libged/png2fb/png2fb.c
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg.c 2020-07-22 12:40:10 UTC
(rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg.c 2020-07-22 12:50:10 UTC
(rev 76411)
@@ -126,34 +126,45 @@
#ifdef GED_PLUGIN
#include "../include/plugin.h"
+
+extern int ged_nmg_cmface_core(struct ged *gedp, int argc, const char *argv[]);
+extern int ged_nmg_collapse_core(struct ged *gedp, int argc, const char
*argv[]);
+extern int ged_nmg_fix_normals_core(struct ged *gedp, int argc, const char
*argv[]);
+extern int ged_nmg_kill_f_core(struct ged* gedp, int argc, const char* argv[]);
+extern int ged_nmg_kill_v_core(struct ged* gedp, int argc, const char* argv[]);
+extern int ged_nmg_make_v_core(struct ged *gedp, int argc, const char *argv[]);
+extern int ged_nmg_mm_core(struct ged *gedp, int argc, const char *argv[]);
+extern int ged_nmg_move_v_core(struct ged* gedp, int argc, const char* argv[]);
+extern int ged_nmg_simplify_core(struct ged *gedp, int argc, const char
*argv[]);
+
struct ged_cmd_impl nmg_cmd_impl = {"nmg", ged_nmg_core, GED_CMD_DEFAULT};
const struct ged_cmd nmg_cmd = { &nmg_cmd_impl };
-struct ged_cmd_impl nmg_cmface_cmd_impl = {"nmg_cmface", ged_nmg_cmface,
GED_CMD_DEFAULT};
+struct ged_cmd_impl nmg_cmface_cmd_impl = {"nmg_cmface", ged_nmg_cmface_core,
GED_CMD_DEFAULT};
const struct ged_cmd nmg_cmface_cmd = { &nmg_cmface_cmd_impl };
-struct ged_cmd_impl nmg_collapse_cmd_impl = {"nmg_collapse", ged_nmg_collapse,
GED_CMD_DEFAULT};
+struct ged_cmd_impl nmg_collapse_cmd_impl = {"nmg_collapse",
ged_nmg_collapse_core, GED_CMD_DEFAULT};
const struct ged_cmd nmg_collapse_cmd = { &nmg_collapse_cmd_impl };
-struct ged_cmd_impl nmg_fix_normals_cmd_impl = {"nmg_fix_normals",
ged_nmg_fix_normals, GED_CMD_DEFAULT};
+struct ged_cmd_impl nmg_fix_normals_cmd_impl = {"nmg_fix_normals",
ged_nmg_fix_normals_core, GED_CMD_DEFAULT};
const struct ged_cmd nmg_fix_normals_cmd = { &nmg_fix_normals_cmd_impl };
-struct ged_cmd_impl nmg_kill_f_cmd_impl = {"nmg_kill_f", ged_nmg_kill_f,
GED_CMD_DEFAULT};
+struct ged_cmd_impl nmg_kill_f_cmd_impl = {"nmg_kill_f", ged_nmg_kill_f_core,
GED_CMD_DEFAULT};
const struct ged_cmd nmg_kill_f_cmd = { &nmg_kill_f_cmd_impl };
-struct ged_cmd_impl nmg_kill_v_cmd_impl = {"nmg_kill_v", ged_nmg_kill_v,
GED_CMD_DEFAULT};
+struct ged_cmd_impl nmg_kill_v_cmd_impl = {"nmg_kill_v", ged_nmg_kill_v_core,
GED_CMD_DEFAULT};
const struct ged_cmd nmg_kill_v_cmd = { &nmg_kill_v_cmd_impl };
-struct ged_cmd_impl nmg_make_v_cmd_impl = {"nmg_make_v", ged_nmg_make_v,
GED_CMD_DEFAULT};
+struct ged_cmd_impl nmg_make_v_cmd_impl = {"nmg_make_v", ged_nmg_make_v_core,
GED_CMD_DEFAULT};
const struct ged_cmd nmg_make_v_cmd = { &nmg_make_v_cmd_impl };
-struct ged_cmd_impl nmg_mm_cmd_impl = {"nmg_mm", ged_nmg_mm, GED_CMD_DEFAULT};
+struct ged_cmd_impl nmg_mm_cmd_impl = {"nmg_mm", ged_nmg_mm_core,
GED_CMD_DEFAULT};
const struct ged_cmd nmg_mm_cmd = { &nmg_mm_cmd_impl };
-struct ged_cmd_impl nmg_move_v_cmd_impl = {"nmg_move_v", ged_nmg_move_v,
GED_CMD_DEFAULT};
+struct ged_cmd_impl nmg_move_v_cmd_impl = {"nmg_move_v", ged_nmg_move_v_core,
GED_CMD_DEFAULT};
const struct ged_cmd nmg_move_v_cmd = { &nmg_move_v_cmd_impl };
-struct ged_cmd_impl nmg_simplify_cmd_impl = {"nmg_simplify", ged_nmg_simplify,
GED_CMD_DEFAULT};
+struct ged_cmd_impl nmg_simplify_cmd_impl = {"nmg_simplify",
ged_nmg_simplify_core, GED_CMD_DEFAULT};
const struct ged_cmd nmg_simplify_cmd = { &nmg_simplify_cmd_impl };
const struct ged_cmd *nmg_cmds[] = {
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg_cmface.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg_cmface.c 2020-07-22
12:40:10 UTC (rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg_cmface.c 2020-07-22
12:50:10 UTC (rev 76411)
@@ -39,8 +39,8 @@
struct vertex *v;
};
-GED_EXPORT int
-ged_nmg_cmface(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_cmface_core(struct ged *gedp, int argc, const char *argv[])
{
struct rt_db_internal internal;
struct directory *dp;
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg_collapse.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg_collapse.c 2020-07-22
12:40:10 UTC (rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg_collapse.c 2020-07-22
12:50:10 UTC (rev 76411)
@@ -33,8 +33,8 @@
#include "../ged_private.h"
-GED_EXPORT int
-ged_nmg_collapse(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_collapse_core(struct ged *gedp, int argc, const char *argv[])
{
char *new_name;
struct model *m;
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg_fix_normals.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg_fix_normals.c 2020-07-22
12:40:10 UTC (rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg_fix_normals.c 2020-07-22
12:50:10 UTC (rev 76411)
@@ -34,8 +34,8 @@
#include "../ged_private.h"
-GED_EXPORT int
-ged_nmg_fix_normals(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_fix_normals_core(struct ged *gedp, int argc, const char *argv[])
{
struct directory *dp;
struct rt_db_internal nmg_intern;
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg_kill_f.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg_kill_f.c 2020-07-22
12:40:10 UTC (rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg_kill_f.c 2020-07-22
12:50:10 UTC (rev 76411)
@@ -72,8 +72,8 @@
}
}
-GED_EXPORT int
-ged_nmg_kill_f(struct ged* gedp, int argc, const char* argv[])
+int
+ged_nmg_kill_f_core(struct ged* gedp, int argc, const char* argv[])
{
struct rt_db_internal internal;
struct directory *dp;
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg_kill_v.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg_kill_v.c 2020-07-22
12:40:10 UTC (rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg_kill_v.c 2020-07-22
12:50:10 UTC (rev 76411)
@@ -254,8 +254,8 @@
}
}
-GED_EXPORT int
-ged_nmg_kill_v(struct ged* gedp, int argc, const char* argv[])
+int
+ged_nmg_kill_v_core(struct ged* gedp, int argc, const char* argv[])
{
struct rt_db_internal internal;
struct directory *dp;
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg_make_v.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg_make_v.c 2020-07-22
12:40:10 UTC (rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg_make_v.c 2020-07-22
12:50:10 UTC (rev 76411)
@@ -39,8 +39,8 @@
struct vertex *v;
};
-GED_EXPORT int
-ged_nmg_make_v(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_make_v_core(struct ged *gedp, int argc, const char *argv[])
{
struct rt_db_internal internal;
struct directory *dp;
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg_mm.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg_mm.c 2020-07-22 12:40:10 UTC
(rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg_mm.c 2020-07-22 12:50:10 UTC
(rev 76411)
@@ -33,8 +33,8 @@
#include "../ged_private.h"
-GED_EXPORT int
-ged_nmg_mm(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_mm_core(struct ged *gedp, int argc, const char *argv[])
{
struct rt_db_internal internal;
struct model *m;
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg_move_v.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg_move_v.c 2020-07-22
12:40:10 UTC (rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg_move_v.c 2020-07-22
12:50:10 UTC (rev 76411)
@@ -257,8 +257,8 @@
}
}
-GED_EXPORT int
-ged_nmg_move_v(struct ged* gedp, int argc, const char* argv[])
+int
+ged_nmg_move_v_core(struct ged* gedp, int argc, const char* argv[])
{
struct rt_db_internal internal;
struct directory *dp;
Modified: brlcad/branches/gedplugins/src/libged/nmg/nmg_simplify.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/nmg/nmg_simplify.c 2020-07-22
12:40:10 UTC (rev 76410)
+++ brlcad/branches/gedplugins/src/libged/nmg/nmg_simplify.c 2020-07-22
12:50:10 UTC (rev 76411)
@@ -33,8 +33,8 @@
#include "../ged_private.h"
-GED_EXPORT int
-ged_nmg_simplify(struct ged *gedp, int argc, const char *argv[])
+int
+ged_nmg_simplify_core(struct ged *gedp, int argc, const char *argv[])
{
struct directory *dp;
struct rt_db_internal nmg_intern;
Modified: brlcad/branches/gedplugins/src/libged/png2fb/png2fb.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/png2fb/png2fb.c 2020-07-22
12:40:10 UTC (rev 76410)
+++ brlcad/branches/gedplugins/src/libged/png2fb/png2fb.c 2020-07-22
12:50:10 UTC (rev 76411)
@@ -192,8 +192,8 @@
#ifdef GED_PLUGIN
#include "../include/plugin.h"
struct ged_cmd_impl png2fb_cmd_impl = {
- "png2fb_core",
- ged_png2fb,
+ "png2fb",
+ ged_png2fb_core,
GED_CMD_DEFAULT
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
