Revert "Just some changes to compile on windows - CMakeLists rename fail part"

This reverts commit 964c5cd902c94a58dad587ac18c0766f889572d5.

3 files changed, 9 insertions, 9 deletions

diff --git a/CMake/Modules/FindLibIntl.cmake b/CMake/Modules/FindLibIntl.cmake
index fbe0b7515..e75960525 100644
--- a/CMake/Modules/FindLibIntl.cmake
+++ b/CMake/Modules/FindLibIntl.cmake
@@ -15,7 +15,7 @@ ENDIF ()
 # for Windows we rely on the environement variables
 # %INCLUDE% and %LIB%; FIND_LIBRARY checks %LIB%
 # automatically on Windows
-IF(_WIN32)
+IF(WIN32)
     FIND_LIBRARY(LibIntl_LIBRARY
         NAMES intl
     )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ead1eb873..aaca9b88d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,19 +33,19 @@ OPTION(USE_SDL2 "Build with SDL 2.0 instead of 1.2" OFF)
 OPTION(ENABLE_NLS "Enable building of tranlations" ON)
 OPTION(ENABLE_TMWA "Enable tmwA support" ON)
 
-IF (_WIN32)
+IF (WIN32)
     SET(PKG_DATADIR ".")
     SET(PKG_BINDIR ".")
     SET(LOCALEDIR ".")
     CONFIGURE_FILE(src/winver.h.in src/winver.h)
-ELSE (_WIN32)
+ELSE (WIN32)
     IF (NOT OSX AND NOT BEOS)
         OPTION(USE_X11 "Use X11 Clipboard functionality" ON)
     ENDIF ()
     SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/manaplus)
     SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
     SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
-ENDIF (_WIN32)
+ENDIF (WIN32)
 
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(src)
@@ -70,7 +70,7 @@ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaPlus")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${VER_MAJOR})
 SET(CPACK_PACKAGE_VERSION_MINOR ${VER_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${VER_RELEASE})
-IF(_WIN32)
+IF(WIN32)
     SET(CPACK_NSIS_DISPLAY_NAME "ManaVerse")
     SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus.ico")
     SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05501d646..64c62002f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,7 +57,7 @@ IF (CMAKE_BUILD_TYPE)
     ENDIF()
 ENDIF()
 
-IF (_WIN32)
+IF (WIN32)
     SET(EXTRA_LIBRARIES ws2_32 winmm)
     FIND_PACKAGE(LibIntl REQUIRED)
 ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR BEOS)
@@ -2213,7 +2213,7 @@ SET(SRCS_TMWA
     gui/widgets/tabs/socialguildtab2.h
     )
 
-IF (_WIN32)
+IF (WIN32)
     SET(SRCS
         ${SRCS}
         fs/specialfolder.cpp
@@ -2237,8 +2237,8 @@ ELSE()
     SET(SRCS ${SRCS})
 ENDIF(ENABLE_TMWA)
 
-ADD_EXECUTABLE(manaplus _WIN32 ${SRCS} ${SRCS_EVOL})
-#ADD_EXECUTABLE(dyecmd _WIN32 ${DYE_CMD_SRCS})
+ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_EVOL})
+#ADD_EXECUTABLE(dyecmd WIN32 ${DYE_CMD_SRCS})
 
 IF (USE_SDL2)
     SET(SDL_LIBS