Skip to content

Commit 90a22eb

Browse files
committed
build: linking against libzip
Signed-off-by: imkiva <[email protected]>
1 parent 0543265 commit 90a22eb

File tree

5 files changed

+753
-2
lines changed

5 files changed

+753
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ matrix:
2626
packages:
2727
- g++-7
2828
- libffi-dev
29+
- libzip-dev
2930
env:
3031
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
3132

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ set(SOURCE_FILES
101101
include/kivm/memory/markSweep.h
102102
include/kivm/memory/universe.h
103103
include/kivm/memory/heapRegion.h
104+
include/shared/zip/libzippp.h
104105
src/kivm/oop/oopBase.cpp
105106
src/kivm/classfile/classFileStream.cpp
106107
src/kivm/oop/oop.cpp
@@ -144,7 +145,9 @@ set(SOURCE_FILES
144145
src/kivm/bytecode/executionInvoke.cpp
145146
src/kivm/bytecode/javaInvocationContext.cpp
146147
src/kivm/memory/markSweep.cpp
147-
src/kivm/memory/universe.cpp src/kivm/native/java_lang_System.cpp)
148+
src/kivm/memory/universe.cpp
149+
src/kivm/native/java_lang_System.cpp
150+
src/shared/zip/libzippp.cpp)
148151

149152

150153
#### libkivm
@@ -153,6 +156,8 @@ target_link_libraries(kivm ffi)
153156
IF (UNIX)
154157
target_link_libraries(kivm pthread)
155158
target_link_libraries(kivm dl)
159+
target_link_libraries(kivm z)
160+
target_link_libraries(kivm zip)
156161
ENDIF ()
157162

158163
#### Executables

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ Kiva's Java Virtual Machine.
1919
4. Enjoy it!
2020

2121
### Credit
22-
Inspired by [wind_jvm](https://github.com/wind2412/wind_jvm)
22+
* Inspired by [wind_jvm](https://github.com/wind2412/wind_jvm)
23+
* Modified version of [libzippp](https://github.com/ctabin/libzippp)

0 commit comments

Comments
 (0)