From 604162acdf5283a9759c1b3ce9e90887a6599ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 29 Sep 2013 21:11:30 +0200 Subject: Turn pack200 into an actual library --- depends/pack200/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'depends/pack200/CMakeLists.txt') diff --git a/depends/pack200/CMakeLists.txt b/depends/pack200/CMakeLists.txt index 79c78f80..657e303c 100644 --- a/depends/pack200/CMakeLists.txt +++ b/depends/pack200/CMakeLists.txt @@ -19,6 +19,7 @@ ELSE(UNIX) ENDIF(UNIX) SET(PACK200_SRC +include/unpack200.h src/bands.cpp src/bands.h src/bytes.cpp @@ -27,7 +28,7 @@ src/coding.cpp src/coding.h src/constants.h src/defines.h -src/main.cpp +src/unpack200.cpp src/unpack.cpp src/unpack.h src/utils.cpp @@ -36,7 +37,9 @@ src/zip.cpp src/zip.h ) -add_executable(unpack200 ${PACK200_SRC}) +include_directories(include) + +add_library(unpack200 STATIC ${PACK200_SRC}) IF(UNIX) target_link_libraries(unpack200 ${ZLIB_LIBRARIES}) @@ -44,3 +47,6 @@ ELSE() # zlib is part of Qt on windows. use it. QT5_USE_MODULES(unpack200 Core) ENDIF() + +add_executable(anti200 anti200.cpp) +target_link_libraries(anti200 unpack200) -- cgit v1.2.3 From 8b0f8b9e597eb50ff9323037fd5fa1b9e330c467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 30 Sep 2013 02:34:46 +0200 Subject: ``Working'' forge unpackers. Needs a lot of hardening but good for alpha. --- depends/pack200/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'depends/pack200/CMakeLists.txt') diff --git a/depends/pack200/CMakeLists.txt b/depends/pack200/CMakeLists.txt index 657e303c..3e41d378 100644 --- a/depends/pack200/CMakeLists.txt +++ b/depends/pack200/CMakeLists.txt @@ -37,6 +37,7 @@ src/zip.cpp src/zip.h ) +SET(PACK200_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) include_directories(include) add_library(unpack200 STATIC ${PACK200_SRC}) -- cgit v1.2.3 From e45b444242104e557f1bce14e9c11e3792bbe41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 30 Sep 2013 03:26:23 +0200 Subject: Add tweaks to make things build on windows --- depends/pack200/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'depends/pack200/CMakeLists.txt') diff --git a/depends/pack200/CMakeLists.txt b/depends/pack200/CMakeLists.txt index 3e41d378..d71f6535 100644 --- a/depends/pack200/CMakeLists.txt +++ b/depends/pack200/CMakeLists.txt @@ -37,9 +37,13 @@ src/zip.cpp src/zip.h ) -SET(PACK200_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) -include_directories(include) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) +SET(PACK200_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) +include_directories( + include + ${ZLIB_INCLUDE_DIRS} +) add_library(unpack200 STATIC ${PACK200_SRC}) IF(UNIX) -- cgit v1.2.3