CI: Drop legacy msvc2005 files, add AppVeyor

diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644 (file)
index 0000000..520f40f
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,25 @@
+# This is pretty useless, but it sets the version of the build
+version: 0.0.0.build.{build}
+
+# Use Visual Studio 2015 base image
+image: Visual Studio 2015
+
+# enforce the location, since we want predictable cmake things
+clone_folder: c:\projects\osslugaru\lugaru
+
+# Build for 32-bit and 64-bit targets
+platform:
+  - x86
+  - x64
+
+# Prep work (CMake VS project generation)
+before_build:
+  - cd c:\projects\osslugaru\lugaru
+  - set PATH=C:\Program Files (x86)\MSBuild\14.0\BIN;%PATH%
+  - if %PLATFORM% == x86 cmake . -DLUGARU_INSTALL_PREFIX=/builds/osslugaru/lugaru/mingw64-build -DLUGARU_FORCE_INTERNAL_SDL=True -DLUGARU_FORCE_INTERNAL_GLU=True -DLUGARU_FORCE_INTERNAL_JPEG=True -DLUGARU_FORCE_INTERNAL_PNG=True -DLUGARU_FORCE_INTERNAL_VORBIS=True -DLUGARU_FORCE_INTERNAL_ZLIB=True -DLUGARU_FORCE_INTERNAL_OPENAL=True
+  - if %PLATFORM% == x64 cmake -G "Visual Studio 14 2015 Win64" . -DLUGARU_INSTALL_PREFIX=/builds/osslugaru/lugaru/mingw64-build -DLUGARU_FORCE_INTERNAL_SDL=True -DLUGARU_FORCE_INTERNAL_GLU=True -DLUGARU_FORCE_INTERNAL_JPEG=True -DLUGARU_FORCE_INTERNAL_PNG=True -DLUGARU_FORCE_INTERNAL_VORBIS=True -DLUGARU_FORCE_INTERNAL_ZLIB=True -DLUGARU_FORCE_INTERNAL_OPENAL=True
+
+# Tell it what to build
+build:
+  - project: lugaru.sln
+  - parallel: true

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63b5bdc3f21fcd9a5c50cc607dd541e9179d01c3..b3a72ae82d362e21bbef85556e7e065be5c0dccc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,16 +189,11 @@ if (NOT OPENAL_FOUND OR LUGARU_FORCE_INTERNAL_OPENAL)
 
     if (WIN32)
         set(LUGARU_HAS_INTERNAL_OPENAL True)
 
     if (WIN32)
         set(LUGARU_HAS_INTERNAL_OPENAL True)

-        if (MSVC80)
-            set(OPENAL_LIBRARY
-                ${OPENALDIR}/lib/win32/msvc2005/OpenAL32.lib
-            )
-        endif (MSVC80)
-        if (MSVC90)
+        if (MSVC)

             set(OPENAL_LIBRARY
                 ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.lib
             )
             set(OPENAL_LIBRARY
                 ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.lib
             )

-        endif (MSVC90)
+        endif (MSVC)

         if (MINGW)
             set(OPENAL_LIBRARY
                 ${OPENALDIR}/lib/win32/mingw/libOpenAL32.dll.a
         if (MINGW)
             set(OPENAL_LIBRARY
                 ${OPENALDIR}/lib/win32/mingw/libOpenAL32.dll.a


@@ -234,18 +229,12 @@ if (NOT SDL_FOUND)
 
     if (WIN32)
         set(LUGARU_HAS_INTERNAL_SDL True)
 
     if (WIN32)
         set(LUGARU_HAS_INTERNAL_SDL True)

-        if (MSVC80)
-          set(SDL_LIBRARY
-              ${SDLDIR}/lib/win32/msvc2005/SDLmain.lib
-              ${SDLDIR}/lib/win32/msvc2005/SDL.lib
-          )
-        endif (MSVC80)
-        if (MSVC90)
+        if (MSVC)

           set(SDL_LIBRARY
               ${SDLDIR}/lib/win32/msvc2008/SDLmain.lib
               ${SDLDIR}/lib/win32/msvc2008/SDL.lib
           )
           set(SDL_LIBRARY
               ${SDLDIR}/lib/win32/msvc2008/SDLmain.lib
               ${SDLDIR}/lib/win32/msvc2008/SDL.lib
           )

-        endif (MSVC90)
+        endif (MSVC)

         if (MINGW)
           set(SDL_LIBRARY
               "mingw32"
         if (MINGW)
           set(SDL_LIBRARY
               "mingw32"


@@ -495,14 +484,10 @@ endif(APPLE)
 
 if(WIN32)
        install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 if(WIN32)
        install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX})

-       if(MSVC80)
-               install(FILES ${SDLDIR}/lib/win32/msvc2005/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
-               install(FILES ${OPENALDIR}/lib/win32/msvc2005/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
-       endif(MSVC80)
-       if(MSVC90)
+       if(MSVC)

                install(FILES ${SDLDIR}/lib/win32/msvc2008/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
                install(FILES ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
                install(FILES ${SDLDIR}/lib/win32/msvc2008/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
                install(FILES ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})

-       endif(MSVC90)
+       endif(MSVC)

        if(MINGW)
                install(FILES ${SDLDIR}/lib/win32/mingw/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
                install(FILES ${OPENALDIR}/lib/win32/mingw/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
        if(MINGW)
                install(FILES ${SDLDIR}/lib/win32/mingw/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
                install(FILES ${OPENALDIR}/lib/win32/mingw/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})

diff --git a/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.dll b/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.dll
deleted file mode 100644 (file)
index b63bb2f..0000000
Binary files a/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.dll and /dev/null differ

diff --git a/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.lib b/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.lib
deleted file mode 100644 (file)
index d635de9..0000000
Binary files a/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.lib and /dev/null differ

diff --git a/Dependencies/SDL12/lib/win32/msvc2005/SDL.dll b/Dependencies/SDL12/lib/win32/msvc2005/SDL.dll
deleted file mode 100644 (file)
index 628cdfc..0000000
Binary files a/Dependencies/SDL12/lib/win32/msvc2005/SDL.dll and /dev/null differ

diff --git a/Dependencies/SDL12/lib/win32/msvc2005/SDL.lib b/Dependencies/SDL12/lib/win32/msvc2005/SDL.lib
deleted file mode 100644 (file)
index 993fd2b..0000000
Binary files a/Dependencies/SDL12/lib/win32/msvc2005/SDL.lib and /dev/null differ

diff --git a/Dependencies/SDL12/lib/win32/msvc2005/SDLmain.lib b/Dependencies/SDL12/lib/win32/msvc2005/SDLmain.lib
deleted file mode 100644 (file)
index 13bf9f9..0000000
Binary files a/Dependencies/SDL12/lib/win32/msvc2005/SDLmain.lib and /dev/null differ

diff --git a/README.md b/README.md
index 0952b715119e727addbfb1b5f34cc846dcb58de5..299ee8dcc1e9decaf58c5f29892f12c1f9bf7c1f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Lugaru HD
 
 # Lugaru HD
 

-[![build status](https://gitlab.com/osslugaru/lugaru/badges/master/build.svg)](https://gitlab.com/osslugaru/lugaru/commits/master)
+[![build status](https://gitlab.com/osslugaru/lugaru/badges/master/build.svg)](https://gitlab.com/osslugaru/lugaru/commits/master) [![Build status](https://ci.appveyor.com/api/projects/status/bbyr9it27c52fiib/branch/master?svg=true)](https://ci.appveyor.com/project/NealGompa/lugaru/branch/master)

 
 This repository holds the official development effort of the open source game
 Lugaru (and in particular of its HD version) for Linux, Mac OSX and Windows.
 
 This repository holds the official development effort of the open source game
 Lugaru (and in particular of its HD version) for Linux, Mac OSX and Windows.