actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #902 from wolfman2000/wolf-windows-zlib-no-dll

Browse Source 
We compile zlib: don't use the old dll.
This commit is contained in:
Jason Felds
2015-10-25 16:29:16 -04:00
parent 52d897e3b6 84afd9bc9c
commit 4cf5b769c7
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Program/zlib1.dll
BIN
View File
Binary file not shown.
src/CMakeLists.txt
-2
View File
@@ -154,7 +154,6 @@ list(APPEND SM_WINDOWS_PROGRAM_DLLS
"${SM_PROGRAM_DIR}/avutil-52.dll"
"${SM_PROGRAM_DIR}/parallel_lights_io.dll"
"${SM_PROGRAM_DIR}/swscale-2.dll"
"${SM_PROGRAM_DIR}/zlib1.dll"
)
if(WIN32)
@@ -615,7 +614,6 @@ if(NOT APPLE)
install(FILES "${SM_PROGRAM_DIR}/avutil-52.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
install(FILES "${SM_PROGRAM_DIR}/parallel_lights_io.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
install(FILES "${SM_PROGRAM_DIR}/swscale-2.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
install(FILES "${SM_PROGRAM_DIR}/zlib1.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
install(FILES "${SM_PROGRAM_DIR}/StepMania.vdi" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
# foreach(SM_WINDOW_DLL "${SM_WINDOWS_PROGRAM_DLLS}")