attempt to silence msvc linker errors

mpictor · mpictor · commit b890c156f5e6 · 2015-08-02T22:50:26.000-04:00
diff --git a/src/cllazyfile/CMakeLists.txt b/src/cllazyfile/CMakeLists.txt
@@ -33,7 +33,7 @@ include_directories(
   ${SC_SOURCE_DIR}/src/base/judy/src
   )
 
-SC_ADDLIB(steplazyfile "${clLazyFile_SRCS};${clLazyFile_HDRS}" "stepcore;stepdai;steputils;base")
+SC_ADDLIB(steplazyfile "${clLazyFile_SRCS};${clLazyFile_HDRS}" "stepcore;stepdai;steputils;base;stepeditor")
 SC_ADDEXEC(lazy_test "lazy_test.cc" "steplazyfile;stepeditor" )
 set_property(TARGET lazy_test APPEND PROPERTY COMPILE_DEFINITIONS "NO_REGISTRY")
 if(TARGET lazy_test-static)
diff --git a/src/clstepcore/sdai.h b/src/clstepcore/sdai.h
@@ -213,6 +213,8 @@ typedef SDAI_Model_contents_ptr SDAI_Model_contents_var;
 
 //  ENTITY
 extern SC_CORE_EXPORT SDAI_Application_instance NilSTEPentity;
+//FIXME why 3 of these? remove 2?
+//in libexpress, ENTITY_NULL is also used but refers to something different
 #define ENTITY_NULL        &NilSTEPentity
 #define NULL_ENTITY        &NilSTEPentity
 #define S_ENTITY_NULL        &NilSTEPentity
diff --git a/src/clstepcore/sdaiApplication_instance.h b/src/clstepcore/sdaiApplication_instance.h
@@ -12,15 +12,15 @@
 * and is not subject to copyright.
 */
 
-#include <sc_export.h>
 #include <map>
 #include <iostream>
 
-//class STEPinvAttrList;
+#include <sc_export.h>
+#include <sdaiDaObject.h>
+
 class EntityAggregate;
 class Inverse_attribute;
 typedef struct {
-//     bool aggregate;
     union {
         EntityAggregate * a;
         SDAI_Application_instance * i;

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ include_directories(`
`33`	`33`	`${SC_SOURCE_DIR}/src/base/judy/src`
`34`	`34`	`)`
`35`	`35`
`36`		`-SC_ADDLIB(steplazyfile "${clLazyFile_SRCS};${clLazyFile_HDRS}" "stepcore;stepdai;steputils;base")`
	`36`	`+SC_ADDLIB(steplazyfile "${clLazyFile_SRCS};${clLazyFile_HDRS}" "stepcore;stepdai;steputils;base;stepeditor")`
`37`	`37`	`SC_ADDEXEC(lazy_test "lazy_test.cc" "steplazyfile;stepeditor" )`
`38`	`38`	`set_property(TARGET lazy_test APPEND PROPERTY COMPILE_DEFINITIONS "NO_REGISTRY")`
`39`	`39`	`if(TARGET lazy_test-static)`