Windows build simplified, static library windows_lib is no more needed

tora-tool · Feb 23, 2016 · a71da61 · a71da61
1 parent bf88f31
commit a71da61
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 12 deletions.
diff --git a/src/windows/CMakeLists.txt → obsolete/windows/CMakeLists.txt b/src/windows/CMakeLists.txt → obsolete/windows/CMakeLists.txt
diff --git a/src/windows/dummy.cpp → obsolete/windows/dummy.cpp b/src/windows/dummy.cpp → obsolete/windows/dummy.cpp
diff --git a/src/windows/resource.h → obsolete/windows/resource.h b/src/windows/resource.h → obsolete/windows/resource.h
diff --git a/src/windows/installer/tora-teradata.nsi → obsolete/windows/tora-teradata.nsi b/src/windows/installer/tora-teradata.nsi → obsolete/windows/tora-teradata.nsi
diff --git a/src/windows/tora.ico → obsolete/windows/tora.ico b/src/windows/tora.ico → obsolete/windows/tora.ico
diff --git a/src/windows/installer/tora.nsi → obsolete/windows/tora.nsi b/src/windows/installer/tora.nsi → obsolete/windows/tora.nsi
diff --git a/src/windows/tora.rc → obsolete/windows/tora.rc b/src/windows/tora.rc → obsolete/windows/tora.rc
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -15,9 +15,6 @@ ENDIF()
 ################################################################################
 
 # ADD_SUBDIRECTORY(i18n)
-IF (WIN32)
-  ADD_SUBDIRECTORY(windows)
-ENDIF (WIN32)
 
 ################################################################################
 #                                 DEFINEs                                      #
@@ -721,10 +718,6 @@ ELSE (WANT_INTERNAL_LOKI)
   SET (TORA_LOKI_LIB ${LOKI_LIBRARIES})
 ENDIF (WANT_INTERNAL_LOKI)
 
-IF (WIN32)
-  SET (WINDOWS_LIB "windows_lib")
-ENDIF (WIN32)
-
 # Handle win/mac special stuff - it's left empty for linux/unix
 SET (GUI_TYPE)
 IF (APPLE)
@@ -770,7 +763,6 @@ ENDIF (WANT_INTERNAL_LOKI)
 
 # prevent opening the cmd.exe window
 IF (WIN32)
-  LIST(APPEND TORA_LIBS ${WINDOWS_LIB})
   LIST(APPEND TORA_LIBS "ws2_32.lib")
   # don't use console subsystem
   IF (MINGW)

diff --git a/utils/Makefile.am b/utils/Makefile.am