5 files changed, 21 insertions, 3 deletions

diff --git a/mgizapp/CMakeLists.txt b/mgizapp/CMakeLists.txt
index 6e2a0c2..42efd4e 100644
--- a/mgizapp/CMakeLists.txt
+++ b/mgizapp/CMakeLists.txt
@@ -26,8 +26,11 @@ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 #set various platform specific global options
 IF(WIN32)
  SET(CMAKE_DEBUG_POSTFIX "d")
+ OPTION( USE_64_BIT "Set to on if you want to compile Win64" OFF )
 ENDIF(WIN32)
 
+
+
 INCLUDE(cmake/FindTR1.cmake)
 
 # include specific modules
@@ -60,8 +63,17 @@ ADD_SUBDIRECTORY (src)
 ADD_SUBDIRECTORY (src/mkcls)
 ADD_SUBDIRECTORY (scripts)
 
+IF (WIN32)
+MESSAGE( STATUS "-------------------------------------------------------------------------------" )
+MESSAGE( STATUS "USE_64_BIT = ${USE_64_BIT}" )
+MESSAGE( STATUS "Change a value with: cmake -D<Variable>=<Value>" )
+MESSAGE( STATUS "-------------------------------------------------------------------------------" )
 
 
+SET( USE_64_BIT "${USE_64_BIT}" CACHE BOOL
+    "Set to ON to build Win64" FORCE )
+ENDIF()
+
 
 
 
diff --git a/mgizapp/src/CMakeLists.txt b/mgizapp/src/CMakeLists.txt
index beb8746..c3941a0 100644
--- a/mgizapp/src/CMakeLists.txt
+++ b/mgizapp/src/CMakeLists.txt
@@ -68,7 +68,13 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR} )
 IF (WIN32)
 	INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/w32 )
 	LINK_DIRECTORIES ( ${PROJECT_SOURCE_DIR}/w32 )
-	SET(CMAKE_THREAD_LIBS_INIT pthread)
+	IF( USE_64_BIT )
+		SET(CMAKE_THREAD_LIBS_INIT pthread64)
+	ELSE( USE_64_BIT )
+		SET(CMAKE_THREAD_LIBS_INIT pthread)
+	ENDIF(  )
+	
+	
 ENDIF()	
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/ )
 LINK_DIRECTORIES ( ${LIBRARY_OUTPUT_PATH} )
diff --git a/mgizapp/src/HMMTables.cpp b/mgizapp/src/HMMTables.cpp
index 0a7175c..c3ec741 100644
--- a/mgizapp/src/HMMTables.cpp
+++ b/mgizapp/src/HMMTables.cpp
@@ -580,12 +580,12 @@ template<class CLS, class MAPPERCLASSTOSTRING> HMMTables<CLS,
 				init_beta.begin(); i!=init_beta.end(); i++) {
 					i->second.second->unlock();
 			}
-#endif
+
 
 	delete lock;
 	delete alphalock;
 	delete betalock;
-#if WIN32
+
 			for (typename hash_map<int,hmmentry_type>::iterator i=
 				init_alpha.begin(); i!=init_alpha.end(); i++) {
 				delete i->second.second;
diff --git a/mgizapp/w32/pthread64.lib b/mgizapp/w32/pthread64.lib
new file mode 100644
index 0000000..a25b34a
--- /dev/null
+++ b/mgizapp/w32/pthread64.lib
diff --git a/mgizapp/w32/pthreadlib64.dll b/mgizapp/w32/pthreadlib64.dll
new file mode 100644
index 0000000..7392a42
--- /dev/null
+++ b/mgizapp/w32/pthreadlib64.dll