Fixed check-express linkage for MSVC.

davyw · mpictor · commit 90dc1d6592bd · 2011-12-07T18:57:51.000-05:00
* Added SCL_EXPRESS_EXPORT flag for yydebug,yydbg_upper_limit,yydbg_lower_limit and yydbg_verbose
* Added xgetopt.cc for check-express/MSVC.
* Added inithook for check-express/MSVC?
* Used set_target_properties COMPILE_DEFINITIONS in stead of add_definitions
  for SCL_EXPRESS_EXPORTS/SCL_EXPRESS_IMPORTS.
diff --git a/include/express/express.h b/include/express/express.h
@@ -98,6 +98,13 @@ struct Express_ {
 # define INITIALLY(value)
 #endif /*EXPRESS_C*/
 
+#ifdef YYDEBUG
+extern SCL_EXPRESS_EXPORT int yydebug;
+extern SCL_EXPRESS_EXPORT int yydbg_upper_limit;
+extern SCL_EXPRESS_EXPORT int yydbg_lower_limit;
+extern SCL_EXPRESS_EXPORT int yydbg_verbose;
+#endif
+
 GLOBAL SCL_EXPRESS_EXPORT Linked_List EXPRESS_path;
 GLOBAL SCL_EXPRESS_EXPORT int EXPRESSpass;
 
@@ -274,7 +281,7 @@ extern SCL_EXPRESS_EXPORT void     EXPRESSresolve PROTO( ( Express ) );
 extern SCL_EXPRESS_EXPORT char    *EXPRESSversion PROTO( ( void ) );
 extern SCL_EXPRESS_EXPORT int      EXPRESS_fail PROTO( ( Express ) );
 extern SCL_EXPRESS_EXPORT int      EXPRESS_succeed PROTO( ( Express ) );
-extern SCL_EXPRESS_EXPORT void     EXPRESSinit_init PROTO( ( void ) );
+extern void     EXPRESSinit_init PROTO( ( void ) );
 #if 0
 extern void     EXPRESSdump_model PROTO( ( Express ) );
 #endif /*0*/
diff --git a/src/express/CMakeLists.txt b/src/express/CMakeLists.txt
@@ -17,7 +17,6 @@ ENDIF()
 
 add_definitions( -DYYDEBUG )  #always define this. equivalent to 'bison -t'
 
-
 YACC_TARGET(ExpParser expparse.y ${CMAKE_CURRENT_BINARY_DIR}/expparse.c COMPILE_FLAGS ${YACC_FLAGS})
 LEX_TARGET(ExpScanner expscan.l ${CMAKE_CURRENT_BINARY_DIR}/expscan.c COMPILE_FLAGS ${LEX_FLAGS})
 ADD_LEX_YACC_DEPENDENCY(ExpScanner ExpParser)
@@ -48,8 +47,15 @@ set(EXPRESS_SOURCES
 )
 
 SET(CHECK_EXPRESS_SOURCES
-     fedex.c
+    fedex.c
+)
+
+IF(MSVC)
+set(CHECK_EXPRESS_MSVC_SOURCES
+    xgetopt.cc
+	inithook.c
 )
+ENDIF(MSVC) 
 
 SET(EXPRESS_PRIVATE_HDRS
     conf.h
@@ -66,7 +72,6 @@ add_definitions( -DFLEX )
 
 if(MSVC)
 add_definitions( -DYY_NO_UNISTD_H )
-add_definitions( -DSCL_EXPRESS_DLL_EXPORTS )
 endif(MSVC)
 
 SCL_ADDLIB(express "${EXPRESS_SOURCES}" "")
@@ -75,4 +80,9 @@ if(APPLE)
     set_target_properties(express PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
 endif(APPLE)
 
-# SCL_ADDEXEC("check-express" "${CHECK_EXPRESS_SOURCES}" express)
+SCL_ADDEXEC("check-express" "${CHECK_EXPRESS_SOURCES} ${CHECK_EXPRESS_MSVC_SOURCES}" express)
+
+if(MSVC)
+set_target_properties(express PROPERTIES COMPILE_DEFINITIONS SCL_EXPRESS_DLL_EXPORTS)
+set_target_properties("check-express" PROPERTIES COMPILE_DEFINITIONS SCL_EXPRESS_DLL_IMPORTS)
+endif(MSVC)
diff --git a/src/express/fedex.c b/src/express/fedex.c
@@ -87,10 +87,10 @@
 #include "express/resolve.h"
 
 #ifdef YYDEBUG
-extern int yydebug;
-extern int yydbg_upper_limit;
-extern int yydbg_lower_limit;
-extern int yydbg_verbose;
+extern SCL_EXPRESS_EXPORT int yydebug;
+extern SCL_EXPRESS_EXPORT int yydbg_upper_limit;
+extern SCL_EXPRESS_EXPORT int yydbg_lower_limit;
+extern SCL_EXPRESS_EXPORT int yydbg_verbose;
 #endif /*YYDEBUG*/
 
 extern SCL_EXPRESS_EXPORT int skip_exp_pause;
