remove xgetopt from two CMakeLists, add export macro to sc_getopt.h

data/CMakeLists.txt

@@ -75,10 +75,7 @@ FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)
     set_tests_properties( generate_cpp_${SCHEMA_SHORT_NAME} PROPERTIES LABELS cpp_schema_gen )
     set_tests_properties( build_cpp_${PROJECT_NAME} PROPERTIES DEPENDS generate_cpp_${SCHEMA_SHORT_NAME} LABELS cpp_schema_build )
 
-    if(MSVC OR BORLAND)
-        set( WIN_EXTRA_SRCS ${SCL_SOURCE_DIR}/src/fedex_plus/xgetopt.cc )
-    endif()
-    SCL_ADDEXEC( p21read_${PROJECT_NAME} "${SCL_SOURCE_DIR}/src/test/p21read/p21read.cc ${WIN_EXTRA_SRCS}" "${PROJECT_NAME}" "TESTABLE" )
+    SCL_ADDEXEC( p21read_${PROJECT_NAME} "${SCL_SOURCE_DIR}/src/test/p21read/p21read.cc" "${PROJECT_NAME}" "TESTABLE" )
     add_dependencies( p21read_${PROJECT_NAME} version_string )
     set_target_properties( p21read_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
                            ${${PROJECT_NAME}_COMPILE_FLAGS} )

src/base/sc_getopt.h

@@ -15,15 +15,16 @@
 
 #ifndef XGETOPT_H
 #define XGETOPT_H
+#include "scl_export.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-    extern int optind, opterr;
-    extern char * optarg;
+    extern SCL_BASE_EXPORT int optind, opterr;
+    extern SCL_BASE_EXPORT char * optarg;
 
-    int sc_getopt( int argc, char * argv[], char * optstring );
+    int    SCL_BASE_EXPORT sc_getopt( int argc, char * argv[], char * optstring );
 
 #ifdef __cplusplus
 }

src/fedex_python/CMakeLists.txt

@@ -10,12 +10,6 @@ include_directories(
 
 add_definitions( -DHAVE_CONFIG_H )
 
-IF(MSVC OR BORLAND)
-set(fedex_plus_MSVC_SOURCES
-    ${SCL_SOURCE_DIR}/src/fedex_plus/xgetopt.cc
-)
-ENDIF(MSVC OR BORLAND)
-
 set(fedex_python_SOURCES
     src/classes_misc_python.c
     ${SCL_SOURCE_DIR}/src/express/fedex.c
@@ -37,7 +31,7 @@ set(fedex_python_SOURCES
     ${SCL_SOURCE_DIR}/src/fedex_plus/write.cc 
     ${SCL_SOURCE_DIR}/src/fedex_plus/print.cc
 )
-SCL_ADDEXEC(fedex_python "${fedex_python_SOURCES} ${fedex_plus_MSVC_SOURCES}" "libexppp express base")
+SCL_ADDEXEC(fedex_python "${fedex_python_SOURCES}" "libexppp express base")
 
 add_dependencies( fedex_python version_string )
 endif(SCL_PYTHON_GENERATOR)