edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let's try the nicer dll names on windows

Browse source
This commit is contained in:
def 2017-07-21 23:43:01 +02:00
parent a7439af1ff
commit c53f39c434
9 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
bam.lua
View file

@ -142,25 +142,25 @@ server_sql_depends = {}
if family == "windows" then if family == "windows" then
if platform == "win32" then if platform == "win32" then
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/freetype/lib32/libfreetype-6.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/freetype/windows/lib32/libfreetype.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/sdl/lib32/SDL2.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/sdl/windows/lib32/SDL2.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/curl/windows/lib32/libcurl-4.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/curl/windows/lib32/libcurl.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libwinpthread-1.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libwinpthread-1.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libgcc_s_sjlj-1.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libgcc_s_sjlj-1.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libogg-0.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libogg.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libopus-0.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libopus.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libopusfile-0.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib32/libopusfile.dll"))
else else
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/freetype/lib64/libfreetype-6.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/freetype/windows/lib64/libfreetype.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/sdl/lib64/SDL2.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/sdl/windows/lib64/SDL2.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/curl/windows/lib64/libcurl-4.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/curl/windows/lib64/libcurl.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib64/libwinpthread-1.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib64/libwinpthread-1.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib64/libogg-0.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib64/libogg.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib64/libopus-0.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib64/libopus.dll"))
table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib64/libopusfile-0.dll")) table.insert(client_depends, CopyToDirectory(".", "ddnet-libs/opus/windows/lib64/libopusfile.dll"))
end end
table.insert(server_sql_depends, CopyToDirectory(".", "ddnet-libs/mysql/vc2005libs/mysqlcppconn.dll")) table.insert(server_sql_depends, CopyToDirectory(".", "ddnet-libs/mysql/windows/mysqlcppconn.dll"))
table.insert(server_sql_depends, CopyToDirectory(".", "ddnet-libs/mysql/vc2005libs/libmysql.dll")) table.insert(server_sql_depends, CopyToDirectory(".", "ddnet-libs/mysql/windows/libmysql.dll"))
if config.compiler.driver == "cl" then if config.compiler.driver == "cl" then
client_link_other = {ResCompile("other/icons/DDNet_cl.rc")} client_link_other = {ResCompile("other/icons/DDNet_cl.rc")}

2
cmake/FindCurl.cmake
View file

@ -23,7 +23,7 @@ set(CURL_INCLUDE_DIRS ${CURL_INCLUDEDIR})
string(FIND "${CURL_LIBRARY}" "${PROJECT_SOURCE_DIR}" LOCAL_PATH_POS) string(FIND "${CURL_LIBRARY}" "${PROJECT_SOURCE_DIR}" LOCAL_PATH_POS)
if(LOCAL_PATH_POS EQUAL 0 AND TARGET_OS STREQUAL "windows") if(LOCAL_PATH_POS EQUAL 0 AND TARGET_OS STREQUAL "windows")
set(CURL_COPY_FILES set(CURL_COPY_FILES
"${EXTRA_CURL_LIBDIR}/libcurl-4.dll" "${EXTRA_CURL_LIBDIR}/libcurl.dll"
) )
else() else()
set(CURL_COPY_FILES) set(CURL_COPY_FILES)

2
cmake/FindFreetype.cmake
View file

@ -24,7 +24,7 @@ set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDEDIR})
string(FIND "${FREETYPE_LIBRARY}" "${PROJECT_SOURCE_DIR}" LOCAL_PATH_POS) string(FIND "${FREETYPE_LIBRARY}" "${PROJECT_SOURCE_DIR}" LOCAL_PATH_POS)
if(LOCAL_PATH_POS EQUAL 0 AND TARGET_OS STREQUAL "windows") if(LOCAL_PATH_POS EQUAL 0 AND TARGET_OS STREQUAL "windows")
set(FREETYPE_COPY_FILES "${EXTRA_FREETYPE_LIBDIR}/libfreetype-6.dll") set(FREETYPE_COPY_FILES "${EXTRA_FREETYPE_LIBDIR}/libfreetype.dll")
else() else()
set(FREETYPE_COPY_FILES) set(FREETYPE_COPY_FILES)
endif() endif()

6
cmake/FindOpusfile.cmake
View file

@ -24,9 +24,9 @@ set(OPUSFILE_INCLUDE_DIRS ${OPUSFILE_INCLUDEDIR})
string(FIND "${OPUSFILE_LIBRARY}" "${PROJECT_SOURCE_DIR}" LOCAL_PATH_POS) string(FIND "${OPUSFILE_LIBRARY}" "${PROJECT_SOURCE_DIR}" LOCAL_PATH_POS)
if(LOCAL_PATH_POS EQUAL 0 AND TARGET_OS STREQUAL "windows") if(LOCAL_PATH_POS EQUAL 0 AND TARGET_OS STREQUAL "windows")
set(OPUSFILE_COPY_FILES set(OPUSFILE_COPY_FILES
"${EXTRA_OPUSFILE_LIBDIR}/libogg-0.dll" "${EXTRA_OPUSFILE_LIBDIR}/libogg.dll"
"${EXTRA_OPUSFILE_LIBDIR}/libopus-0.dll" "${EXTRA_OPUSFILE_LIBDIR}/libopus.dll"
"${EXTRA_OPUSFILE_LIBDIR}/libopusfile-0.dll" "${EXTRA_OPUSFILE_LIBDIR}/libopusfile.dll"
"${EXTRA_OPUSFILE_LIBDIR}/libwinpthread-1.dll" "${EXTRA_OPUSFILE_LIBDIR}/libwinpthread-1.dll"
) )
if (TARGET_BITS EQUAL 32) if (TARGET_BITS EQUAL 32)

2
ddnet-libs

@ -1 +1 @@
Subproject commit e2e4953afd0d1f903693cd2a6977b8425b57b1e4 Subproject commit 8135082b8ea3ad911abcda39ef21bed1da77c62c

6
other/freetype.lua
View file

@ -30,11 +30,11 @@ FreeType = {
elseif option.use_winlib > 0 then elseif option.use_winlib > 0 then
if option.use_winlib == 32 then if option.use_winlib == 32 then
settings.link.libpath:Add("ddnet-libs/freetype/lib32") settings.link.libpath:Add("ddnet-libs/freetype/windows/lib32")
else else
settings.link.libpath:Add("ddnet-libs/freetype/lib64") settings.link.libpath:Add("ddnet-libs/freetype/windows/lib64")
end end
settings.link.libs:Add("freetype-6") settings.link.libs:Add("freetype")
end end
end end

2
other/mysql.lua
View file

@ -67,6 +67,8 @@ Mysql = {
elseif platform == "linux" then elseif platform == "linux" then
settings.link.libpath:Add("ddnet-libs/mysql/linux/lib64") settings.link.libpath:Add("ddnet-libs/mysql/linux/lib64")
settings.link.libpath:Add("ddnet-libs/mysql/linux/lib32") settings.link.libpath:Add("ddnet-libs/mysql/linux/lib32")
elseif platform == "windows" then
settings.link.libpath:Add("ddnet-libs/mysql/windows")
end end
end end
end end

4
other/sdl.lua
View file

@ -41,9 +41,9 @@ SDL = {
if option.use_winlib > 0 then if option.use_winlib > 0 then
settings.cc.includes:Add("ddnet-libs/sdl/include") settings.cc.includes:Add("ddnet-libs/sdl/include")
if option.use_winlib == 32 then if option.use_winlib == 32 then
settings.link.libpath:Add("ddnet-libs/sdl/lib32") settings.link.libpath:Add("ddnet-libs/sdl/windows/lib32")
else else
settings.link.libpath:Add("ddnet-libs/sdl/lib64") settings.link.libpath:Add("ddnet-libs/sdl/windows/lib64")
end end
settings.link.libs:Add("SDL2") settings.link.libs:Add("SDL2")
settings.link.libs:Add("SDL2main") settings.link.libs:Add("SDL2main")

10
scripts/make_release.py
View file

@ -69,14 +69,14 @@ if include_data and not use_bundle:
if platform[:3] == "win": if platform[:3] == "win":
shutil.copy("other/config_directory.bat", package_dir) shutil.copy("other/config_directory.bat", package_dir)
shutil.copy("SDL2.dll", package_dir) shutil.copy("SDL2.dll", package_dir)
shutil.copy("libfreetype-6.dll", package_dir) shutil.copy("libfreetype.dll", package_dir)
if platform == "win32": if platform == "win32":
shutil.copy("libgcc_s_sjlj-1.dll", package_dir) shutil.copy("libgcc_s_sjlj-1.dll", package_dir)
shutil.copy("libwinpthread-1.dll", package_dir) shutil.copy("libwinpthread-1.dll", package_dir)
shutil.copy("libogg-0.dll", package_dir) shutil.copy("libogg.dll", package_dir)
shutil.copy("libopus-0.dll", package_dir) shutil.copy("libopus.dll", package_dir)
shutil.copy("libopusfile-0.dll", package_dir) shutil.copy("libopusfile.dll", package_dir)
shutil.copy("libcurl-4.dll", package_dir) shutil.copy("libcurl.dll", package_dir)
if include_exe and not use_bundle: if include_exe and not use_bundle:
shutil.copy(name+exe_ext, package_dir) shutil.copy(name+exe_ext, package_dir)