Merge remote-tracking branch 'origin/master'
# Conflicts: # include/JUI/Widgets/Button.hpp
This commit is contained in:
@@ -38,7 +38,7 @@ CPMAddPackage(
|
||||
|
||||
CPMAddPackage(
|
||||
NAME J3ML
|
||||
URL https://git.redacted.cc/josh/j3ml/archive/Release-3.2.zip
|
||||
URL https://git.redacted.cc/josh/j3ml/archive/Release-3.4.zip
|
||||
)
|
||||
|
||||
CPMAddPackage(
|
||||
@@ -53,7 +53,7 @@ CPMAddPackage(
|
||||
|
||||
CPMAddPackage(
|
||||
NAME JGL
|
||||
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-37.zip
|
||||
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-38.zip
|
||||
)
|
||||
|
||||
target_include_directories(JUI PUBLIC ${Event_SOURCE_DIR}/include)
|
||||
|
Reference in New Issue
Block a user