Skip to content

Commit

Permalink
Merge Development branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
@aquawicket
aquawicket committed Jan 6, 2023
2 parents dc718bb + 5e65667 commit 181eacd
Show file tree
Hide file tree
Showing 583 changed files with 6,828 additions and 2,126 deletions.
34 changes: 34 additions & 0 deletions 3rdParty/_DKIMPORTS/bullet3/DKMAKE.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ if(Bullet3Collision)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Collision/libBullet3Collision.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/Bullet3Collision/${DEBUG_DIR}//libBullet3Collision.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/Bullet3Collision/${RELEASE_DIR}/libBullet3Collision.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/Bullet3Collision/libBullet3Collision.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Collision/libBullet3Collision.a)
endif()
if(Bullet3Common)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/Bullet3Common_Debug.lib)
Expand All @@ -48,6 +50,8 @@ if(Bullet3Common)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Common/libBullet3Common.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/Bullet3Common/${DEBUG_DIR}//libBullet3Common.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/Bullet3Common/${RELEASE_DIR}/libBullet3Common.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/Bullet3Common/libBullet3Common.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Common/libBullet3Common.a)
endif()
if(Bullet3Dynamics)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/Bullet3Dynamics_Debug.lib)
Expand All @@ -58,6 +62,8 @@ if(Bullet3Dynamics)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Dynamics/libBullet3Dynamics.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/Bullet3Dynamics/${DEBUG_DIR}//libBullet3Dynamics.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/Bullet3Dynamics/${RELEASE_DIR}/libBullet3Dynamics.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/Bullet3Dynamics/libBullet3Dynamics.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Dynamics/libBullet3Dynamics.a)
endif()
if(Bullet3Geometry)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/Bullet3Geometry_Debug.lib)
Expand All @@ -68,6 +74,8 @@ if(Bullet3Geometry)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Geometry/libBullet3Geometry.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/Bullet3Geometry/${DEBUG_DIR}//libBullet3Geometry.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/Bullet3Geometry/${RELEASE_DIR}/libBullet3Geometry.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/Bullet3Geometry/libBullet3Geometry.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Geometry/libBullet3Geometry.a)
endif()
if(Bullet3OpenCL)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/Bullet3OpenCL_clew_Debug.lib)
Expand All @@ -78,6 +86,8 @@ if(Bullet3OpenCL)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3OpenCL/libBullet3OpenCL_clew.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/Bullet3OpenCL/${DEBUG_DIR}//libBullet3OpenCL_clew.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/Bullet3OpenCL/${RELEASE_DIR}/libBullet3OpenCL_clew.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/Bullet3OpenCL/libBullet3OpenCL_clew.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3OpenCL/libBullet3OpenCL_clew.a)
endif()
if(Bullet3Serialize)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/BulletFileLoader_Debug.lib)
Expand All @@ -88,6 +98,8 @@ if(Bullet3Serialize)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Serialize/Bullet2FileLoader/libBullet2FileLoader.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/Bullet3Serialize/${DEBUG_DIR}//libBullet3Serialize.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/Bullet3Serialize/${RELEASE_DIR}/libBullet3Serialize.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/Bullet3Serialize/Bullet2FileLoader/libBullet2FileLoader.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/Bullet3Serialize/Bullet2FileLoader/libBullet2FileLoader.a)
endif()
if(BulletCollision)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/BulletCollision_Debug.lib)
Expand All @@ -98,6 +110,8 @@ if(BulletCollision)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletCollision/libBulletCollision.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/BulletCollision/${DEBUG_DIR}//libBulletCollision.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/BulletCollision/${RELEASE_DIR}/libBulletCollision.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/BulletCollision/libBulletCollision.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletCollision/libBulletCollision.a)
endif()
if(BulletDynamics)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/BulletDynamics_Debug.lib)
Expand All @@ -108,6 +122,8 @@ if(BulletDynamics)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletDynamics/libBulletDynamics.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/BulletDynamics/${DEBUG_DIR}/libBulletDynamics.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/BulletDynamics/${RELEASE_DIR}/libBulletDynamics.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/BulletDynamics/libBulletDynamics.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletDynamics/libBulletDynamics.a)
endif()
if(BulletInverseDynamics)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/BulletInverseDynamics_Debug.lib)
Expand All @@ -118,6 +134,8 @@ if(BulletInverseDynamics)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletInverseDynamics/libBulletInverseDynamics.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/BulletInverseDynamics/${DEBUG_DIR}/libBulletInverseDynamics.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/BulletInverseDynamics/${RELEASE_DIR}/libBulletInverseDynamics.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/BulletInverseDynamics/libBulletInverseDynamics.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletInverseDynamics/libBulletInverseDynamics.a)
endif()
if(BulletSoftBody)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/BulletSoftBody_Debug.lib)
Expand All @@ -128,6 +146,8 @@ if(BulletSoftBody)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletSoftBody/libBulletSoftBody.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/BulletSoftBody/${DEBUG_DIR}/libBulletSoftBody.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/BulletSoftBody/${RELEASE_DIR}/libBulletSoftBody.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/BulletSoftBody/libBulletSoftBody.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletSoftBody/libBulletSoftBody.a)
endif()
if(LinearMath)
WIN_dk_libDebug (${BULLET3}/${OS}/lib/${DEBUG_DIR}/LinearMath_Debug.lib)
Expand All @@ -138,6 +158,8 @@ if(LinearMath)
LINUX_dk_libRelease (${BULLET3}/${OS}/${RELEASE_DIR}/src/LinearMath/libLinearMath.a)
ANDROID_dk_libDebug (${BULLET3}/${OS}/src/LinearMath/${DEBUG_DIR}/libLinearMath.a)
ANDROID_dk_libRelease (${BULLET3}/${OS}/src/LinearMath/${RELEASE_DIR}/libLinearMath.a)
EMSCRIPTEN_dk_libDebug (${BULLET3}/${OS}/${DEBUG_DIR}/src/LinearMath/libLinearMath.a)
EMSCRIPTEN_dk_libRelease(${BULLET3}/${OS}/${RELEASE_DIR}/src/LinearMath/libLinearMath.a)
endif(LinearMath)


Expand Down Expand Up @@ -187,6 +209,18 @@ ANDROID_dk_set(BULLET3_CMAKE
-DBULLET_MATH_LIBRARY=${BULLET3}/${OS}/src/LinearMath/${RELEASE_DIR}/libLinearMath.a
-DBULLET_SOFTBODY_LIBRARY=${BULLET3}/${OS}/src/BulletSoftBody/${RELEASE_DIR}/libBulletSoftBody.a
-DBULLET_INCLUDE_DIR=${BULLET3}/include)
EMSCRIPTEN_DEBUG_dk_set(BULLET3_CMAKE
-DBULLET_DYNAMICS_LIBRARY=${BULLET3}/${OS}/${DEBUG_DIR}/src/BulletDynamics/libBulletDynamics.a
-DBULLET_COLLISION_LIBRARY=${BULLET3}/${OS}/${DEBUG_DIR}/src/BulletCollision/libBulletCollision.a
-DBULLET_MATH_LIBRARY=${BULLET3}/${OS}/${DEBUG_DIR}/src/LinearMath/libLinearMath.a
-DBULLET_SOFTBODY_LIBRARY=${BULLET3}/${OS}/${DEBUG_DIR}/src/BulletSoftBody/libBulletSoftBody.a
-DBULLET_INCLUDE_DIR=${BULLET3}/include)
EMSCRIPTEN_RELEASE_dk_set(BULLET3_CMAKE
-DBULLET_DYNAMICS_LIBRARY=${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletDynamics/libBulletDynamics.a
-DBULLET_COLLISION_LIBRARY=${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletCollision/libBulletCollision.a
-DBULLET_MATH_LIBRARY=${BULLET3}/${OS}/${RELEASE_DIR}/src/LinearMath/libLinearMath.a
-DBULLET_SOFTBODY_LIBRARY=${BULLET3}/${OS}/${RELEASE_DIR}/src/BulletSoftBody/libBulletSoftBody.a
-DBULLET_INCLUDE_DIR=${BULLET3}/include)


### GENERATE ###
Expand Down
95 changes: 54 additions & 41 deletions 3rdParty/_DKIMPORTS/bzip2/DKMAKE.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ dk_depend(libgcc)

### IMPORT ###
WIN_dk_import (https://github.com/kiyolee/bzip2-win-build/archive/refs/tags/v1.0.8.zip)
APPLE_dk_import (ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
LINUX_dk_import (ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
RASPBERRY_dk_import (ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
ANDROID_dk_import (ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
UNIX_dk_import (ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
#APPLE_dk_import (ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
#LINUX_dk_import (ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
#RASPBERRY_dk_import(ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
#ANDROID_dk_import (ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz)
if(NOT EXISTS ${BZIP2}/copy)
dk_copy(${BZIP2} ${BZIP2}/copy OVERWRITE)
endif()
Expand All @@ -32,23 +33,27 @@ WIN32_dk_libDebug (${BZIP2}/${OS}/${DEBUG_DIR}/libbz2-static.lib)
WIN32_dk_libRelease (${BZIP2}/${OS}/${RELEASE_DIR}/libbz2-static.lib)
WIN64_dk_libDebug (${BZIP2}/${OS}/x64/${DEBUG_DIR}/libbz2-static.lib)
WIN64_dk_libRelease (${BZIP2}/${OS}/x64/${RELEASE_DIR}/libbz2-static.lib)
APPLE_dk_libDebug (${BZIP2}/${OS}/libbz2.a)
APPLE_dk_libRelease (${BZIP2}/${OS}/libbz2.a)
LINUX_dk_libDebug (${BZIP2}/${OS}/libbz2.a)
LINUX_dk_libRelease (${BZIP2}/${OS}/libbz2.a)
RASPBERRY_dk_libDebug (${BZIP2}/${OS}/libbz2.a)
RASPBERRY_dk_libRelease (${BZIP2}/${OS}/libbz2.a)
ANDROID_dk_libDebug (${BZIP2}/${OS}/libbz2.a)
ANDROID_dk_libRelease (${BZIP2}/${OS}/libbz2.a)
UNIX_dk_libDebug (${BZIP2}/${OS}/libbz2.a)
UNIX_dk_libRelease (${BZIP2}/${OS}/libbz2.a)
#APPLE_dk_libDebug (${BZIP2}/${OS}/libbz2.a)
#APPLE_dk_libRelease (${BZIP2}/${OS}/libbz2.a)
#LINUX_dk_libDebug (${BZIP2}/${OS}/libbz2.a)
#LINUX_dk_libRelease (${BZIP2}/${OS}/libbz2.a)
#RASPBERRY_dk_libDebug (${BZIP2}/${OS}/libbz2.a)
#RASPBERRY_dk_libRelease(${BZIP2}/${OS}/libbz2.a)
#ANDROID_dk_libDebug (${BZIP2}/${OS}/libbz2.a)
#ANDROID_dk_libRelease (${BZIP2}/${OS}/libbz2.a)



### 3RDPARTY LINK ###
WIN_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/${DEBUG_DIR}/libbz2-static.lib -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/${RELEASE_DIR}/libbz2-static.lib)
APPLE_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)
LINUX_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)
RASPBERRY_dk_set(BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)
ANDROID_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)
WIN_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/${DEBUG_DIR}/libbz2-static.lib -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/${RELEASE_DIR}/libbz2-static.lib)
UNIX_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)
#APPLE_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)
#LINUX_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)
#RASPBERRY_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)
#ANDROID_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)
#EMSCRIPTEN_dk_set (BZIP2_CMAKE -DBZIP2_INCLUDE_DIR=${BZIP2}/${OS} -DBZIP2_LIBRARY_DEBUG=${BZIP2}/${OS}/libbz2.a -DBZIP2_LIBRARY_RELEASE=${BZIP2}/${OS}/libbz2.a)



Expand All @@ -70,34 +75,42 @@ if(WIN_64)
dk_build (${BZIP2_FOLDER} libbz2-static x64)
endif()

if(APPLE)
if(UNIX)
if(NOT EXISTS ${BZIP2}/${OS}/bzip2.c)
dk_copy (${BZIP2}/copy ${BZIP2}/${OS} OVERWRITE)
endif()
dk_setPath (${BZIP2}/${OS})
dk_queueCommand (make)
endif()

if(LINUX)
if(NOT EXISTS ${BZIP2}/${OS}/bzip2.c)
dk_copy (${BZIP2}/copy ${BZIP2}/${OS} OVERWRITE)
endif()
dk_setPath (${BZIP2}/${OS})
dk_queueCommand (make)
endif()

if(RASPBERRY)
if(NOT EXISTS ${BZIP2}/${OS}/bzip2.c)
dk_copy (${BZIP2}/copy ${BZIP2}/${OS} OVERWRITE)
endif()
dk_setPath (${BZIP2}/${OS})
dk_queueCommand (make)
endif()

if(ANDROID)
if(NOT EXISTS ${BZIP2}/${OS}/bzip2.c)
dk_copy (${BZIP2}/copy ${BZIP2}/${OS} OVERWRITE)
endif()
dk_setPath (${BZIP2}/${OS})
dk_queueCommand (make)
endif()
#if(APPLE)
# if(NOT EXISTS ${BZIP2}/${OS}/bzip2.c)
# dk_copy (${BZIP2}/copy ${BZIP2}/${OS} OVERWRITE)
# endif()
# dk_setPath (${BZIP2}/${OS})
# dk_queueCommand (make)
#endif()

#if(LINUX)
# if(NOT EXISTS ${BZIP2}/${OS}/bzip2.c)
# dk_copy (${BZIP2}/copy ${BZIP2}/${OS} OVERWRITE)
# endif()
# dk_setPath (${BZIP2}/${OS})
# dk_queueCommand (make)
#endif()

#if(RASPBERRY)
# if(NOT EXISTS ${BZIP2}/${OS}/bzip2.c)
# dk_copy (${BZIP2}/copy ${BZIP2}/${OS} OVERWRITE)
# endif()
# dk_setPath (${BZIP2}/${OS})
# dk_queueCommand (make)
#endif()

#if(ANDROID)
# if(NOT EXISTS ${BZIP2}/${OS}/bzip2.c)
# dk_copy (${BZIP2}/copy ${BZIP2}/${OS} OVERWRITE)
# endif()
# dk_setPath (${BZIP2}/${OS})
# dk_queueCommand (make)
#endif()
5 changes: 3 additions & 2 deletions 3rdParty/_DKIMPORTS/cryptopp/DKMAKE.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,23 @@ RASPBERRY_dk_libDebug (${CRYPTOPP}/${OS}/${DEBUG_DIR}/libcryptopp.a)
RASPBERRY_dk_libRelease (${CRYPTOPP}/${OS}/${RELEASE_DIR}/libcryptopp.a)
ANDROID_dk_libDebug (${CRYPTOPP}/${OS}/${DEBUG_DIR}/libcryptopp.a)
ANDROID_dk_libRelease (${CRYPTOPP}/${OS}/${RELEASE_DIR}/libcryptopp.a)
EMSCRIPTEN_dk_libDebug (${CRYPTOPP}/${OS}/${DEBUG_DIR}/libcryptopp.a)
EMSCRIPTEN_dk_libRelease(${CRYPTOPP}/${OS}/${RELEASE_DIR}/libcryptopp.a)


### GENERATE ###
WIN_dk_queueCommand (${DKCMAKE_BUILD} -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DBUILD_TESTING=OFF ${CRYPTOPP})

string(REPLACE "-DMAC " " " DKCMAKE_BUILD_CRYPTOPP "${DKCMAKE_BUILD}") #fix for class named MAC in cryptopp
MAC_dk_queueCommand (${DKCMAKE_BUILD_CRYPTOPP} -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DBUILD_TESTING=OFF -DCRYPTOPP_DISABLE_MIXED_ASM=ON ${CRYPTOPP})
IOS_dk_queueCommand (${DKCMAKE_BUILD} -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DBUILD_TESTING=OFF ${LIBMD_CMAKE} ${CRYPTOPP})
IOSSIM_dk_queueCommand (${DKCMAKE_BUILD} -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DBUILD_TESTING=OFF ${LIBMD_CMAKE} ${CRYPTOPP})
LINUX_dk_queueCommand (${DKCMAKE_BUILD} -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DBUILD_TESTING=OFF ${CRYPTOPP})
RASPBERRY_dk_queueCommand (${DKCMAKE_BUILD} -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DBUILD_TESTING=OFF ${CRYPTOPP})

string(REPLACE "-DANDROID_CPP_FEATURES=\"rtti exceptions\"" "" DKCMAKE_BUILD_CRYPTOPP "${DKCMAKE_BUILD}")
string(REPLACE "-std=c++1z" "" DKCMAKE_BUILD_CRYPTOPP "${DKCMAKE_BUILD_CRYPTOPP}")
string(REPLACE " " " " DKCMAKE_BUILD_CRYPTOPP "${DKCMAKE_BUILD_CRYPTOPP}")
ANDROID_dk_queueCommand (${DKCMAKE_BUILD_CRYPTOPP} "-DCMAKE_CXX_FLAGS=/I${ANDROID-NDK}/sources/android/cpufeatures" -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DBUILD_TESTING=OFF ${CRYPTOPP})
EMSCRIPTEN_dk_queueCommand (${DKCMAKE_BUILD} -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DBUILD_TESTING=OFF ${CRYPTOPP})


### COMPILE ###
Expand Down
15 changes: 9 additions & 6 deletions 3rdParty/_DKIMPORTS/curl/DKMAKE.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ else()
endif()



### 3RDPARTY LINK ###
WIN_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=/I${CURL}/${OS}/include/curl" "-DCMAKE_CXX_FLAGS=/I${CURL}/${OS}/include/curl" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/lib/${RELEASE_DIR}/libcurl.lib)
APPLE_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=-I${CURL}/${OS}/include" "-DCMAKE_CXX_FLAGS=-I${CURL}/${OS}/include" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/lib/${RELEASE_DIR}/libcurl.a)
LINUX_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=-I${CURL}/${OS}/include" "-DCMAKE_CXX_FLAGS=-I${CURL}/${OS}/include" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/${RELEASE_DIR}/lib/libcurl.a)
RASPBERRY_dk_set(CURL_CMAKE "-DCMAKE_C_FLAGS=-I${CURL}/${OS}/include" "-DCMAKE_CXX_FLAGS=-I${CURL}/${OS}/include" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/${RELEASE_DIR}/lib/libcurl.a)
ANDROID_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=-I${CURL}/${OS}/include" "-DCMAKE_CXX_FLAGS=-I${CURL}/${OS}/include" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/lib/${RELEASE_DIR}/libcurl.a)
WIN_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=/I${CURL}/${OS}/include/curl" "-DCMAKE_CXX_FLAGS=/I${CURL}/${OS}/include/curl" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/lib/${RELEASE_DIR}/libcurl.lib)
APPLE_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=-I${CURL}/${OS}/include" "-DCMAKE_CXX_FLAGS=-I${CURL}/${OS}/include" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/lib/${RELEASE_DIR}/libcurl.a)
LINUX_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=-I${CURL}/${OS}/include" "-DCMAKE_CXX_FLAGS=-I${CURL}/${OS}/include" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/${RELEASE_DIR}/lib/libcurl.a)
RASPBERRY_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=-I${CURL}/${OS}/include" "-DCMAKE_CXX_FLAGS=-I${CURL}/${OS}/include" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/${RELEASE_DIR}/lib/libcurl.a)
ANDROID_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=-I${CURL}/${OS}/include" "-DCMAKE_CXX_FLAGS=-I${CURL}/${OS}/include" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/lib/${RELEASE_DIR}/libcurl.a)
EMSCRIPTEN_dk_set (CURL_CMAKE "-DCMAKE_C_FLAGS=-I${CURL}/${OS}/include" "-DCMAKE_CXX_FLAGS=-I${CURL}/${OS}/include" -DCURL_INCLUDE_DIR=${CURL}/include -DCURL_LIBRARY=${CURL}/${OS}/${RELEASE_DIR}/lib/libcurl.a)


### GENERATE ###
WIN_dk_queueCommand (${DKCMAKE_BUILD} -DCURL_STATICLIB=ON -DBUILD_CURL_EXE=OFF -DBUILD_CURL_TESTS=OFF -DCURL_DISABLE_LDAP=ON -DCURL_USE_OPENSSL=ON -DCURL_STATIC_CRT=ON ${OPENSSL_CMAKE} ${ZLIB_CMAKE} ${CURL})
Expand Down Expand Up @@ -88,6 +89,8 @@ IOSSIM_dk_queueCommand(
LINUX_dk_queueCommand (${DKCMAKE_BUILD} -DCURL_STATICLIB=ON -DBUILD_CURL_EXE=OFF -DBUILD_CURL_TESTS=OFF -DCURL_DISABLE_LDAP=ON -DCURL_USE_OPENSSL=OFF ${OPENSSL_CMAKE} ${ZLIB_CMAKE} ${CURL})
RASPBERRY_dk_queueCommand (${DKCMAKE_BUILD} -DCURL_STATICLIB=ON -DBUILD_CURL_EXE=OFF -DBUILD_CURL_TESTS=OFF -DCURL_DISABLE_LDAP=ON -DCURL_USE_OPENSSL=OFF ${OPENSSL_CMAKE} ${ZLIB_CMAKE} ${CURL})
ANDROID_dk_queueCommand (${DKCMAKE_BUILD} -DCURL_STATICLIB=ON -DBUILD_CURL_EXE=OFF -DBUILD_CURL_TESTS=OFF -DCURL_DISABLE_LDAP=ON -DCURL_USE_OPENSSL=OFF -DHAVE_POSIX_STRERROR_R=1 -DHAVE_GLIBC_STRERROR_R=advanced -DHAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT=advanced ${OPENSSL_CMAKE} ${ZLIB_CMAKE} ${CURL})
EMSCRIPTEN_dk_queueCommand (${DKCMAKE_BUILD} -DCURL_STATICLIB=ON -DBUILD_CURL_EXE=OFF -DBUILD_CURL_TESTS=OFF -DCURL_DISABLE_LDAP=ON -DCURL_USE_OPENSSL=OFF ${OPENSSL_CMAKE} ${ZLIB_CMAKE} ${CURL})


### COMPILE ###
dk_build(${CURL_FOLDER} libcurl)
Expand Down
2 changes: 1 addition & 1 deletion 3rdParty/_DKIMPORTS/ddd/DKMAKE.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

# TODO
# sudo apt-get install ddd
LINUX_HOST_dk_command(sudo apt -y install ddd) #FIXME sudo needed
LINUX_HOST_dk_command(sudo apt -y install ddd) #FIXME sudo needed
Loading

0 comments on commit 181eacd

Please sign in to comment.