2 files changed, 10 insertions, 7 deletions
diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/CMakeLists.txt b/Tests/LoadCommandOneConfig/CMakeCommands/CMakeLists.txt
index c5112c7..55b6b8b 100644
--- a/Tests/LoadCommandOneConfig/CMakeCommands/CMakeLists.txt
+++ b/Tests/LoadCommandOneConfig/CMakeCommands/CMakeLists.txt
@@ -6,8 +6,13 @@ ENDIF (MUDSLIDE_TYPE MATCHES MUCHO)
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}")
-
+IF(WATCOM)
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ENDIF(WATCOM)
 INCLUDE_DIRECTORIES(${CMAKE_ROOT}/include ${CMAKE_ROOT}/Source)
 
 ADD_LIBRARY(cmCMAKE_TEST_COMMAND MODULE cmTestCommand.c)
 
+IF(WATCOM)
+  TARGET_LINK_LIBRARIES(cmCMAKE_TEST_COMMAND clbsdll.lib)
+ENDIF(WATCOM)
diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
index 5ca9b33..bd36b5c 100644
--- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
+++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
@@ -10,9 +10,8 @@ typedef struct
   char** Argv;
 } cmVTKWrapTclData;
 
-
 /* do almost everything in the initial pass */
-static int InitialPass(void *inf, void *mf, int argc, char *argv[])
+static int CCONV InitialPass(void *inf, void *mf, int argc, char *argv[])
 {
   char* file;
   char* str;
@@ -134,7 +133,7 @@ static int InitialPass(void *inf, void *mf, int argc, char *argv[])
   return 1;
 }
 
-static void FinalPass(void *inf, void *mf) 
+static void  CCONV FinalPass(void *inf, void *mf) 
 {
   cmLoadedCommandInfo *info = (cmLoadedCommandInfo *)inf;
   /* get our client data from initial pass */
@@ -146,8 +145,7 @@ static void FinalPass(void *inf, void *mf)
     fprintf(stderr,"*** Failed LOADED COMMAND Final Pass\n");
     }
 }
-
-static void Destructor(void *inf) 
+static void CCONV Destructor(void *inf) 
 {
   cmLoadedCommandInfo *info = (cmLoadedCommandInfo *)inf;
   /* get our client data from initial pass */
@@ -157,7 +155,7 @@ static void Destructor(void *inf)
 }
 
 #ifdef MUCHO_MUDSLIDE
-void CM_PLUGIN_EXPORT CMAKE_TEST_COMMANDInit(cmLoadedCommandInfo *info)
+void CM_PLUGIN_EXPORT CCONV CMAKE_TEST_COMMANDInit(cmLoadedCommandInfo *info)
 {
   info->InitialPass = InitialPass;
   info->FinalPass = FinalPass;