Skip to content

Commit

Permalink
Fix Various Post-Release Bugs (#215)
Browse files Browse the repository at this point in the history
* Fix various bugs

1. set/getFont use StrongRef methods
2. RestoreState(Checked) checks Scissor and BlendState
3. Re-enable soc:u on 3DS
4. Fix renderer corrupting data if bigger than > 4096 verts(?)
5. Add setColorMask nil/none arg
6. Fix up fused games
7. Change logfile.lua to be more useful
8. Use FetchContent_Declare for lua-https
9. Set up cert info in sdmc:/config/ssl/cacert.pem
10. TextShaper fixes

* fix lua-https bit here

* update files for piepie

* Fix up Matrices and Stuff (#216)

* piepie did some things with matrices, fix up checkTextureSettings (with table)

* fix up some more things

* fix this one line in cafe graphics

* should get() the unique_ptr

* why is this still templated
  • Loading branch information
TurtleP authored Nov 9, 2023
1 parent 5eae13c commit 9ac497c
Show file tree
Hide file tree
Showing 63 changed files with 1,156 additions and 1,711 deletions.
47 changes: 28 additions & 19 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -229,22 +229,33 @@ add_library(lua53
)
target_link_libraries(lua53 PRIVATE PkgConfig::lua51)

add_library(luahttps
libraries/luahttps/common/Connection.h
libraries/luahttps/common/ConnectionClient.h
libraries/luahttps/common/HTTPRequest.cpp
libraries/luahttps/common/HTTPRequest.h
libraries/luahttps/common/HTTPSClient.cpp
libraries/luahttps/common/HTTPSClient.h
libraries/luahttps/common/HTTPSCommon.cpp
libraries/luahttps/common/HTTPSCommon.h
libraries/luahttps/common/PlaintextConnection.cpp
libraries/luahttps/common/PlaintextConnection.h
libraries/luahttps/generic/CurlClient.cpp
libraries/luahttps/generic/CurlClient.h
libraries/luahttps/https.cpp
FetchContent_Declare(lua-https
GIT_REPOSITORY https://github.com/lovebrew/lua-https
GIT_TAG TurtleP/certs
)
target_link_libraries(luahttps PRIVATE PkgConfig::lua51)

FetchContent_MakeAvailable(lua-https)

add_library(lua-https STATIC
${lua-https_SOURCE_DIR}/src/common/config.h
${lua-https_SOURCE_DIR}/src/common/Connection.h
${lua-https_SOURCE_DIR}/src/common/ConnectionClient.h
${lua-https_SOURCE_DIR}/src/common/HTTPRequest.cpp
${lua-https_SOURCE_DIR}/src/common/HTTPRequest.h
${lua-https_SOURCE_DIR}/src/common/HTTPS.cpp
${lua-https_SOURCE_DIR}/src/common/HTTPS.h
${lua-https_SOURCE_DIR}/src/common/HTTPSClient.cpp
${lua-https_SOURCE_DIR}/src/common/HTTPSClient.h
${lua-https_SOURCE_DIR}/src/common/PlaintextConnection.cpp
${lua-https_SOURCE_DIR}/src/common/PlaintextConnection.h
${lua-https_SOURCE_DIR}/src/generic/CurlClient.cpp
${lua-https_SOURCE_DIR}/src/generic/CurlClient.h
${lua-https_SOURCE_DIR}/src/generic/OpenSSLConnection.cpp
${lua-https_SOURCE_DIR}/src/generic/OpenSSLConnection.h
${lua-https_SOURCE_DIR}/src/lua/luahttps.cpp
)

target_compile_definitions(lua-https PRIVATE HTTPS_BACKEND_CURL HTTPS_BACKEND_CURL_LINKED)

# luasocket
add_library(luasocket
Expand Down Expand Up @@ -311,7 +322,6 @@ add_library(wuff
libraries/wuff/wuff_memory.c
)


target_compile_definitions(${PROJECT_NAME} PRIVATE
__APP_VERSION__=\"${VERSION}\" __LOVE_VERSION__=\"${LOVE_VERSION}\"
__EMULATION__
Expand All @@ -326,12 +336,12 @@ target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::lua51)

# link curl
pkg_check_modules(libcurl REQUIRED IMPORTED_TARGET libcurl)
target_link_libraries(luahttps PRIVATE PkgConfig::libcurl)
target_link_libraries(lua-https PRIVATE PkgConfig::lua51 PkgConfig::libcurl)

# link everything else
target_link_libraries(${PROJECT_NAME} PRIVATE
${APP_LIBS} physfs box2d z turbojpeg png vorbisidec ogg
modplug luabit lua53 wuff ddsparse luahttps luasocket noise1234
modplug luabit lua53 wuff ddsparse lua-https luasocket noise1234
)

# Include directories
Expand All @@ -340,7 +350,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE
libraries/ddsparse
libraries/dr
libraries/lua53
libraries/luahttps
libraries/luasocket
libraries/noise1234
libraries/utf8
Expand Down
2 changes: 1 addition & 1 deletion include/common/drawable.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ namespace love
{}

virtual void Draw(Graphics<Console::Which>& graphics,
const Matrix4<Console::Which>& matrix) = 0;
const Matrix4& matrix) = 0;
};
} // namespace love
Loading

0 comments on commit 9ac497c

Please sign in to comment.