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

Revert "We compile zlib: don't use the old dll."

Browse Source
This commit is contained in:
Jason Felds
2015-10-25 20:39:56 -04:00
parent 4cf5b769c7
commit de9fc48a1a
2 changed files with 2 additions and 0 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,6 +154,7 @@ list(APPEND SM_WINDOWS_PROGRAM_DLLS
"${SM_PROGRAM_DIR}/avutil-52.dll" "${SM_PROGRAM_DIR}/avutil-52.dll"
"${SM_PROGRAM_DIR}/parallel_lights_io.dll" "${SM_PROGRAM_DIR}/parallel_lights_io.dll"
"${SM_PROGRAM_DIR}/swscale-2.dll" "${SM_PROGRAM_DIR}/swscale-2.dll"
"${SM_PROGRAM_DIR}/zlib1.dll"
) )
if(WIN32) if(WIN32)
@@ -614,6 +615,7 @@ if(NOT APPLE)
install(FILES "${SM_PROGRAM_DIR}/avutil-52.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}") 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}/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}/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}") install(FILES "${SM_PROGRAM_DIR}/StepMania.vdi" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
# foreach(SM_WINDOW_DLL "${SM_WINDOWS_PROGRAM_DLLS}") # foreach(SM_WINDOW_DLL "${SM_WINDOWS_PROGRAM_DLLS}")