Revision: 75936
http://sourceforge.net/p/brlcad/code/75936
Author: starseeker
Date: 2020-05-26 11:30:48 +0000 (Tue, 26 May 2020)
Log Message:
-----------
Fix build. Something is still broken, as MGED is not initializing correctly...
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/include/dm.h
brlcad/branches/dm-fb-merge/include/tclcad.h
brlcad/branches/dm-fb-merge/src/mged/attach.c
Modified: brlcad/branches/dm-fb-merge/include/dm.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm.h 2020-05-26 02:53:36 UTC (rev
75935)
+++ brlcad/branches/dm-fb-merge/include/dm.h 2020-05-26 11:30:48 UTC (rev
75936)
@@ -86,7 +86,6 @@
DM_EXPORT extern struct dm dm_qt;
DM_EXPORT extern struct dm dm_osgl;
-DM_EXPORT extern int Dm_Init(void *interp);
DM_EXPORT extern void *dm_interp(struct dm *dmp);
DM_EXPORT extern int dm_share_dlist(struct dm *dmp1,
struct dm *dmp2);
Modified: brlcad/branches/dm-fb-merge/include/tclcad.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/tclcad.h 2020-05-26 02:53:36 UTC
(rev 75935)
+++ brlcad/branches/dm-fb-merge/include/tclcad.h 2020-05-26 11:30:48 UTC
(rev 75936)
@@ -533,8 +533,8 @@
/* The presence of Tcl_Interp as an arg prevents giving arg list */
TCLCAD_EXPORT extern void fb_tcl_setup(void);
TCLCAD_EXPORT extern int Fb_Init(Tcl_Interp *interp);
+TCLCAD_EXPORT extern int Dm_Init(void *interp);
-
__END_DECLS
#endif /* TCLCAD_H */
Modified: brlcad/branches/dm-fb-merge/src/mged/attach.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/mged/attach.c 2020-05-26 02:53:36 UTC
(rev 75935)
+++ brlcad/branches/dm-fb-merge/src/mged/attach.c 2020-05-26 11:30:48 UTC
(rev 75936)
@@ -44,6 +44,7 @@
#include "vmath.h"
#include "bu/env.h"
#include "ged.h"
+#include "tclcad.h"
#include "./mged.h"
#include "./titles.h"
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
