Skip to content

Commit

Permalink
Add zip lib as proper dep, retain existing usage
Browse files Browse the repository at this point in the history
  • Loading branch information
iKlsR committed Nov 1, 2018
1 parent 293eda3 commit ee1cc13
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 5,733 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "src/bullet3"]
path = src/bullet3
url = https://github.com/bulletphysics/bullet3.git
[submodule "src/zip"]
path = src/zip
url = https://github.com/kuba--/zip.git
12 changes: 7 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ else()
endif()

add_subdirectory(src/bullet3)
# add_subdirectory(src/zip)

set(SRCS
src/graphics/mesh.cpp
Expand Down Expand Up @@ -109,10 +110,10 @@ set(SRCS
src/libovr/Src/OVR_CAPI_Util.cpp
src/libovr/Src/OVR_StereoProjection.cpp
src/libovr/Src/OVR_CAPIShim.c
src/zip/zip.c
src/physics/environment.cpp
src/physics/physicshelper.cpp
src/scenegraph/grabnode.cpp
src/scenegraph/grabnode.cpp
src/zip/src/zip.c
)

set (HEADERS
Expand Down Expand Up @@ -212,12 +213,12 @@ set (HEADERS
src/libovr/Include/Extras/OVR_Math.h
src/libovr/Include/Extras/OVR_StereoProjection.h
src/libovr/Src/OVR_CAPI_Prototypes.h
src/zip/miniz.h
src/zip/zip.h
src/physics/environment.h
src/physics/physicshelper.h
src/physics/physicsproperties.h
src/scenegraph/grabnode.h
src/scenegraph/grabnode.h
src/zip/src/zip.h
src/zip/src/miniz.h
)

qt5_wrap_cpp(HEADERS_moc ${HEADERS})
Expand All @@ -237,6 +238,7 @@ add_library(IrisGL SHARED ${SRCS} ${HEADERS_moc} ${QRCS})
# Note the DIRs that are included, assimp generates a config that we need to find in the build dir. L2
target_include_directories(IrisGL PUBLIC
"${PROJECT_SOURCE_DIR}/src/"
"${PROJECT_SOURCE_DIR}/src/zip/src"
"${PROJECT_BINARY_DIR}/src/assimp/include/"
"${PROJECT_SOURCE_DIR}/src/assimp/include/"
"${PROJECT_SOURCE_DIR}/src/libovr/Include"
Expand Down
1 change: 1 addition & 0 deletions src/zip
Submodule zip added at 64aa7b
Loading

0 comments on commit ee1cc13

Please sign in to comment.