configure appveyor

.gitignore

@@ -70,10 +70,7 @@ ipch/
 #ref/
 *.aps
 
-builds/build_*
+builds/
-builds/*.zip
-builds/deps_*
-
 doc/
 
 CMakeLists.txt.user

CMakeLists.txt

@@ -78,7 +78,7 @@ set(SOURCES
 "vertex.cpp"
 )
 
-set (ARCH "x86")
+set (PREFIX "")
 
 if (WIN32)
 	add_definitions(-DHAVE_ROUND) # to make pymath to not redefine round
@@ -99,9 +99,12 @@ if (WIN32)
 	
 	if(${CMAKE_EXE_LINKER_FLAGS} STREQUAL "/machine:x64")
 		set (ARCH "x64")
+	else()
+		set (ARCH "x86")
 	endif()
-	
+
-	
+	set (PREFIX "-${ARCH}")
+
 	set(GLEW_LIBRARY ${GLEW_LIBRARY} "${DEPS_DIR}/glew/lib/${ARCH}/glew32s.lib")
 	set(GLFW3_LIBRARIES ${GLFW3_LIBRARIES} "${DEPS_DIR}/glfw/lib/${ARCH}/glfw3.lib")
 	set(GLUT_glut_LIBRARY ${GLFW3_ROOT_PATH} "${DEPS_DIR}/freeglut/lib/${ARCH}/freeglut.lib")
@@ -120,7 +123,6 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
 endif()
 
 add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS})
-#set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h")
 add_precompiled_header(${PROJECT_NAME} stdafx.h FORCEINCLUDE SOURCE_CXX stdafx.cpp)
 
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
@@ -134,10 +136,11 @@ string(TIMESTAMP data_exe %y%m%d)
 
 set_target_properties( ${PROJECT_NAME}
     PROPERTIES
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib"
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-	OUTPUT_NAME "${PROJECT_NAME}-${ARCH}_${data_exe}"
+    PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/pdb"
+	OUTPUT_NAME "${PROJECT_NAME}${PREFIX}_${data_exe}"
 	DEBUG_POSTFIX "_d"
 )
 

README.md

@@ -1,4 +1,4 @@
 # maszyna
-[![Build status](https://ci.appveyor.com/api/projects/status/21isv1q3y1socgvn/branch/mover_in_c++?svg=true)](https://ci.appveyor.com/project/Milek7/maszyna/branch/mover_in_c++)
+[![Build status](https://ci.appveyor.com/api/projects/status/ouns27vystoasiwx?svg=true)](https://ci.appveyor.com/project/Milek7/maszyna-8kwj6/branch/master)
 
 MaSzyna Train Simulator

appveyor.yml

@@ -1,42 +1,47 @@
 version: '{build}'
-branches:
-  except:
-  - master
-  - dp
 image: Visual Studio 2015
 clone_depth: 1
 build_script:
 - cmd: >-
+    mkdir builds
+    
     cd builds
     
-    cmake_win32.bat
+    mkdir x86
     
-    cd build_win32
+    cd x86
+    
+    cmake ../.. -T v140_xp
     
     cmake --build . --config RelWithDebInfo
     
     cd ..
     
-    cmake_win64.bat
+    mkdir x64
     
-    cd build_win64
+    cd x64
+    
+    cmake ../.. -A x64
     
     cmake --build . --config RelWithDebInfo
     
     cd ..
     
-    7z a symbols.zip build_win32/RelWithDebInfo/eu07++ng.pdb build_win64/RelWithDebInfo/eu07++ng.pdb
+    7z a eu07_x86_bin.zip ./x86/bin/RelWithDebInfo/*.exe
+    
+    7z a eu07_x86_pdb.zip ./x86/pdb/RelWithDebInfo/*.pdb
+    
+    7z a eu07_x64_bin.zip ./x64/bin/RelWithDebInfo/*.exe
+    
+    7z a eu07_x64_pdb.zip ./x64/pdb/RelWithDebInfo/*.pdb
 test: off
 deploy: off
 artifacts:
-- path: builds/build_win32/RelWithDebInfo/eu07++ng.exe
+- path: builds/eu07_x86_bin.zip
-  name: release_win32
+  name: binaries_x86
-- path: builds/build_win64/RelWithDebInfo/eu07++ng.exe
+- path: builds/eu07_x64_bin.zip
-  name: release_win64
+  name: binaries_x64
-- path: shaders
+- path: builds/eu07_x86_pdb.zip
-  name: shaders
+  name: symbols_x86
-  type: zip
+- path: builds/eu07_x64_pdb.zip
-- path: builds/symbols.zip
+  name: symbols_x64
-  name: symbols
-cache:
-    - builds/deps_win -> builds/download_windeps.bat

builds/cmake_win32.bat

@@ -1,23 +0,0 @@
-if not exist deps_win call %~dp0download_windeps.bat
-set DEPS_DIR="%cd%/deps_win"
-if not exist build_win32 mkdir build_win32
-pushd build_win32
-cmake ../.. -T v140_xp ^
--DGLEW_INCLUDE_DIR=%DEPS_DIR%/glew-2.0.0/include ^
--DGLEW_LIBRARY=%DEPS_DIR%/glew-2.0.0/lib/Release/Win32/glew32.lib ^
--DGLFW3_ROOT_PATH=%DEPS_DIR%/glfw-3.2.1.bin.WIN32 ^
--DGLUT_INCLUDE_DIR=%DEPS_DIR%/freeglut/include ^
--DGLUT_glut_LIBRARY=%DEPS_DIR%/freeglut/lib/freeglut.lib ^
--DPNG_PNG_INCLUDE_DIR=%DEPS_DIR%/libpng/include ^
--DPNG_LIBRARY=%DEPS_DIR%/libpng/lib/win32/libpng16.lib ^
--DZLIB_INCLUDE_DIR=%DEPS_DIR%/zlib-1.2.11 ^
--DGLM_ROOT_DIR=%DEPS_DIR%/glm-0.9.8.4 ^
--DOPENAL_INCLUDE_DIR=%DEPS_DIR%/openal/include ^
--DOPENAL_LIBRARY=%DEPS_DIR%/openal/lib/win32/OpenAL32.lib ^
--DLIBSNDFILE_INCLUDE_DIR=%DEPS_DIR%/libsndfile/include ^
--DLIBSNDFILE_LIBRARY=%DEPS_DIR%/libsndfile/lib/win32/libsndfile-1.lib ^
--DLUAJIT_INCLUDE_DIR=%DEPS_DIR%/luajit/include ^
--DLUAJIT_LIBRARIES=%DEPS_DIR%/luajit/lib/win32/lua51.lib ^
--Dlibserialport_INCLUDE_DIR=%DEPS_DIR%/libserialport/include ^
--Dlibserialport_LIBRARY=%DEPS_DIR%/libserialport/lib/win32/libserialport-0.lib
-popd

builds/cmake_win64.bat

@@ -1,23 +0,0 @@
-if not exist deps_win call %~dp0download_windeps.bat
-set DEPS_DIR="%cd%/deps_win"
-if not exist build_win64 mkdir build_win64
-pushd build_win64
-cmake ../.. -A x64 ^
--DGLEW_INCLUDE_DIR=%DEPS_DIR%/glew-2.0.0/include ^
--DGLEW_LIBRARY=%DEPS_DIR%/glew-2.0.0/lib/Release/x64/glew32.lib ^
--DGLFW3_ROOT_PATH=%DEPS_DIR%/glfw-3.2.1.bin.WIN64 ^
--DGLUT_INCLUDE_DIR=%DEPS_DIR%/freeglut/include ^
--DGLUT_glut_LIBRARY=%DEPS_DIR%/freeglut/lib/x64/freeglut.lib ^
--DPNG_PNG_INCLUDE_DIR=%DEPS_DIR%/libpng/include ^
--DPNG_LIBRARY=%DEPS_DIR%/libpng/lib/win64/libpng16.lib ^
--DZLIB_INCLUDE_DIR=%DEPS_DIR%/zlib-1.2.11 ^
--DGLM_ROOT_DIR=%DEPS_DIR%/glm-0.9.8.4 ^
--DOPENAL_INCLUDE_DIR=%DEPS_DIR%/openal/include ^
--DOPENAL_LIBRARY=%DEPS_DIR%/openal/lib/win64/OpenAL32.lib ^
--DLIBSNDFILE_INCLUDE_DIR=%DEPS_DIR%/libsndfile/include ^
--DLIBSNDFILE_LIBRARY=%DEPS_DIR%/libsndfile/lib/win64/libsndfile-1.lib ^
--DLUAJIT_INCLUDE_DIR=%DEPS_DIR%/luajit/include ^
--DLUAJIT_LIBRARIES=%DEPS_DIR%/luajit/lib/win64/lua51.lib ^
--Dlibserialport_INCLUDE_DIR=%DEPS_DIR%/libserialport/include ^
--Dlibserialport_LIBRARY=%DEPS_DIR%/libserialport/lib/win64/libserialport-0.lib
-popd

builds/download_windeps.bat

@@ -1,2 +0,0 @@
-powershell "$wc = New-Object System.Net.WebClient; $wc.DownloadFile(\"https://milek7.pl/.stuff/eu07exe/builddep4.zip\", \"%cd%\deps_win.zip\")"
-powershell "$s = New-Object -ComObject shell.application; $z = $s.Namespace(\"%cd%\deps_win.zip\"); foreach ($i in $z.items()) { $s.Namespace(\"%cd%\").CopyHere($i) }"