From 168d6e85a3f6d5effe57c73780aff3accc3e117e Mon Sep 17 00:00:00 2001 From: VB Date: Wed, 22 Mar 2017 15:27:24 +0100 Subject: [PATCH] build system scripts --- .gitignore | 3 ++- CMakeLists.txt | 3 ++- builds/cmake_win32.bat | 15 +++++++++++++++ builds/cmake_win64.bat | 15 +++++++++++++++ builds/download_windeps.bat | 2 ++ 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 builds/cmake_win32.bat create mode 100644 builds/cmake_win64.bat create mode 100644 builds/download_windeps.bat diff --git a/.gitignore b/.gitignore index 549b13c4..700ddb3d 100644 --- a/.gitignore +++ b/.gitignore @@ -70,4 +70,5 @@ ipch/ ref/ *.aps -builds/ \ No newline at end of file +builds/build_* +builds/*.zip \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index e8e9ef6f..9adbcfeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,8 +105,9 @@ include_directories(${PYTHON_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES}) find_package(PNG REQUIRED) -include_directories(${PNG_INCLUDE_DIRS}) +include_directories(${PNG_INCLUDE_DIRS} ${PNG_PNG_INCLUDE_DIR}) target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARIES}) +target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARY}) find_package(GLM REQUIRED) include_directories(${GLM_INCLUDE_DIRS}) \ No newline at end of file diff --git a/builds/cmake_win32.bat b/builds/cmake_win32.bat new file mode 100644 index 00000000..7237e543 --- /dev/null +++ b/builds/cmake_win32.bat @@ -0,0 +1,15 @@ +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 +popd \ No newline at end of file diff --git a/builds/cmake_win64.bat b/builds/cmake_win64.bat new file mode 100644 index 00000000..7e350eb6 --- /dev/null +++ b/builds/cmake_win64.bat @@ -0,0 +1,15 @@ +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 +popd \ No newline at end of file diff --git a/builds/download_windeps.bat b/builds/download_windeps.bat new file mode 100644 index 00000000..58f75e46 --- /dev/null +++ b/builds/download_windeps.bat @@ -0,0 +1,2 @@ +powershell "$wc = New-Object System.Net.WebClient; $wc.DownloadFile(\"https://milek7.pl/.stuff/eu07exe/builddep1.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) }" \ No newline at end of file