Sun Dec 24 17:12:07 PST 2017

Author: jng
Date: 2017-12-24 17:12:07 -0800 (Sun, 24 Dec 2017)
New Revision: 9261

Removed:
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/dwfx/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/dwfx/reader/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/opc/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/opc/reader/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/reader/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/utility/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.0/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.01/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.11/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.20/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/reader/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/utility/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/data/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/impl/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/model/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/plot/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/jpeg/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/utility/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/xps/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/ansi/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/crypto/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/digest/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/expat/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/mac/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/paging/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/sqlite/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/utility/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/x64/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/x86/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/zip/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/zlib/CMakeLists.txt
Modified:
   sandbox/jng/cmake_v2/Common/CMakeLists.txt
   sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt
   sandbox/jng/cmake_v2/Common/Stylization/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/XAML/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/whiptk/CMakeLists.txt
   sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt
Log:
#940: Get most of DWF Toolkit building properly (sans undefined DWFCore::AtomicIncrement/DWFCore::AtomicDecrement), and add Stylization into the CMake fold

Modified: sandbox/jng/cmake_v2/Common/CMakeLists.txt
===================================================================

--- sandbox/jng/cmake_v2/Common/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Common/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -5,7 +5,7 @@
 find_package (Freetype REQUIRED)
 find_package (JPEG REQUIRED)
 find_package (PNG REQUIRED)
-#find_package (FDO REQUIRED)
+find_package (FDO REQUIRED)
 
 add_definitions( -DACE_HAS_THREAD_SAFE_ACCEPT )
 
@@ -17,4 +17,4 @@
 #add_subdirectory(PlatformBase)
 #add_subdirectory(Renderers)
 add_subdirectory(Security)
-#add_subdirectory(Stylization)
\ No newline at end of file
+add_subdirectory(Stylization)
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -3,6 +3,8 @@
 include_directories(${GD_INCLUDE_DIR}
     ${FREETYPE_INCLUDE_DIRS}
     ${PNG_INCLUDE_DIRS}
+    ${FDO_INCLUDE_DIR}
+    ${FDO_INCLUDE_DIR}/ExpressionEngine
     ${MG_OEM_DWF_INCLUDE_DIR}
     ${MG_OEM_DWF_INCLUDE_DIR}/dwf
     ${MG_OEM_AGG_INCLUDE_DIR}
@@ -62,8 +64,11 @@
     ${JPEG_LIBRARY}
     ${PNG_LIBRARY}
     ${AGG_LIBRARY}
-    ${dwfcore_LIBRARY}
-    ${dwf_LIBRARY}
+    dwfcore
+    dwftk
+    dwfwhiptk
+    dwfw3dtk
+    MgStylization-${MG_VERSION}
 )
 
 #install( TARGETS ${MgRenderers_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} )
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Common/Stylization/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/Stylization/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Common/Stylization/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,5 +1,12 @@
 project(stylization)
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+    ${FDO_INCLUDE_DIR}
+    ${FDO_INCLUDE_DIR}/ExpressionEngine
+    ${CMAKE_CURRENT_SOURCE_DIR}/../MdfModel
+    ${CMAKE_CURRENT_SOURCE_DIR}/../Foundation
+)
+
 set (MgStylization_LIBRARY MgStylization-${MG_VERSION})
 
 set (MgStylization_SRCS
@@ -95,8 +102,10 @@
 add_library(${MgStylization_LIBRARY} SHARED ${MgStylization_SRCS})
 
 target_link_libraries(${MgStylization_LIBRARY}
-    ${FDO_EXPRESSION_ENGINE_LIBRARY}
+    ${FDO_EXPRESSIONENGINE_LIBRARY}
     ${FDO_LIBRARY}
+    MgFoundation-${MG_VERSION}
+    MgMdfModel-${MG_VERSION}
 )
 
 #install( TARGETS ${MgStylization_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} )
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,2 +1,26 @@
+project(dwftk)
+
+add_definitions(-DHAVE_MEMMOVE -DHAVE_ASM_ATOMIC_H -DDWFCORE_BUILD_ZLIB -DDWFCORE_BUILD_EXPAT -D_DWFCORE_USE_ASM_ATOMIC_H)
+
+set (DWF_VERSION_MAJOR 7)
+set (DWF_VERSION_MINOR 7)
+set (DWF_VERSION_REV 0)
+set (DWF_VERSION "${DWF_VERSION_MAJOR}.${DWF_VERSION_MINOR}.${DWF_VERSION_REV}")
+
+set (DWFCORE_VERSION_MAJOR 1)
+set (DWFCORE_VERSION_MINOR 7)
+set (DWFCORE_VERSION_REV 0)
+set (DWFCORE_VERSION "${DWFCORE_VERSION_MAJOR}.${DWFCORE_VERSION_MINOR}.${DWFCORE_VERSION_REV}")
+
+set (W3DTK_VERSION_MAJOR 1)
+set (W3DTK_VERSION_MINOR 7)
+set (W3DTK_VERSION_REV 1555)
+set (W3DTK_VERSION "${W3DTK_VERSION_MAJOR}.${W3DTK_VERSION_MINOR}.${W3DTK_VERSION_REV}")
+
+set (W2DTK_VERSION_MAJOR 7)
+set (W2DTK_VERSION_MINOR 13)
+set (W2DTK_VERSION_REV 1601)
+set (W2DTK_VERSION "${W3DTK_VERSION_MAJOR}.${W3DTK_VERSION_MINOR}.${W3DTK_VERSION_REV}")
+
 add_subdirectory(dwf)
 add_subdirectory(dwfcore)
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,37 +1,154 @@
-project(dwf)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-set (DWF_VERSION_MAJOR 7)
-set (DWF_VERSION_MINOR 7)
-set (DWF_VERSION_REV 0)
-set (DWF_VERSION "${DWF_VERSION_MAJOR}.${DWF_VERSION_MINOR}.${DWF_VERSION_REV}")
-
-add_subdirectory(dwfx)
-add_subdirectory(opc)
-add_subdirectory(package)
-add_subdirectory(presentation)
-add_subdirectory(publisher)
 add_subdirectory(w3dtk)
 add_subdirectory(whiptk)
-add_subdirectory(XAML)
-add_subdirectory(xps)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-set (dwf_LIBRARY dwfcore-${DWF_VERSION})
-
-set (dwf_SRCS
+set (dwftk_SRCS
     Toolkit.cpp
+    #dwfx
+    dwfx/Constants.cpp
+    dwfx/ContentPart.cpp
+    dwfx/CustomProperties.cpp
+    dwfx/DocumentPresentationsPart.cpp
+    dwfx/DWFDocument.cpp
+    dwfx/DWFDocumentSequence.cpp
+    dwfx/DWFProperties.cpp
+    dwfx/DWFSection.cpp
+    dwfx/FixedDocument.cpp
+    dwfx/FixedDocumentSequence.cpp
+    dwfx/FixedPage.cpp
+    dwfx/Package.cpp
+    dwfx/ResourcePart.cpp
+    dwfx/reader/CustomPropertiesReader.cpp
+    dwfx/reader/DWFDocumentSequenceReader.cpp
+    dwfx/reader/DWFPropertiesReader.cpp
+    dwfx/reader/FixedPageResourceExtractor.cpp
+    #opc
+    opc/Constants.cpp
+    opc/ContentTypes.cpp
+    opc/CoreProperties.cpp
+    opc/Package.cpp
+    opc/Part.cpp
+    opc/PartContainer.cpp
+    opc/PhysicalLayerReader.cpp
+    opc/PhysicalLayerWriter.cpp
+    opc/Relationship.cpp
+    opc/RelationshipContainer.cpp
+    opc/XMLPart.cpp
+    opc/ZipFileReader.cpp
+    opc/ZipWriter.cpp
+    opc/reader/CorePropertiesReader.cpp
+    opc/reader/RelationshipContainerReader.cpp
+    #package
+    package/Bookmark.cpp
+    package/Class.cpp
+    package/Constants.cpp
+    package/Content.cpp
+    package/ContentElement.cpp
+    package/ContentManager.cpp
+    package/CoordinateSystem.cpp
+    package/CustomSection.cpp
+    package/DataSection.cpp
+    package/DefinedObject.cpp
+    package/EModelSection.cpp
+    package/Entity.cpp
+    package/EPlotSection.cpp
+    package/Feature.cpp
+    package/FontResource.cpp
+    package/GlobalSection.cpp
+    package/GraphicResource.cpp
+    package/Group.cpp
+    package/Instance.cpp
+    package/Interface.cpp
+    package/Manifest.cpp
+    package/Object.cpp
+    package/ObjectDefinition.cpp
+    package/ObjectDefinitionResource.cpp
+    package/Paper.cpp
+    package/Property.cpp
+    package/PropertySet.cpp
+    package/Resource.cpp
+    package/Section.cpp
+    package/SectionBuilder.cpp
+    package/SectionContentResource.cpp
+    package/Signature.cpp
+    package/SignatureRequest.cpp
+    package/SignatureResource.cpp
+    package/SignatureSection.cpp
+    package/Source.cpp
+    package/Units.cpp
+    package/X509.cpp
+    package/XML.cpp
+    package/reader/ContentReader.cpp
+    package/reader/ContentResourceReader.cpp
+    package/reader/DataSectionDescriptorReader.cpp
+    package/reader/DuplicateAttributeFilter.cpp
+    package/reader/EModelSectionDescriptorReader.cpp
+    package/reader/EPlotSectionDescriptorReader.cpp
+    package/reader/GlobalSectionDescriptorReader.cpp
+    package/reader/ObjectDefinitionReader.cpp
+    package/reader/PackageManifestReader.cpp
+    package/reader/PackageReader.cpp
+    package/reader/SectionDescriptorReader.cpp
+    package/reader/SignatureReader.cpp
+    package/reader/SignatureSectionDescriptorReader.cpp
+    package/utility/DefinedObjectContainer.cpp
+    package/utility/DWFPackageFileDescriptor.cpp
+    package/utility/PropertyContainer.cpp
+    package/utility/ResourceContainer.cpp
+    package/writer/DWF6PackageWriter.cpp
+    package/writer/DWFXPackageWriter.cpp
+    package/writer/PackageWriter.cpp
+    package/writer/extensions/6.0/PackageVersionExtension60.cpp
+    package/writer/extensions/6.01/PackageVersionExtension601.cpp
+    package/writer/extensions/6.11/PackageVersionExtension611.cpp
+    package/writer/extensions/6.20/PackageVersionExtension620.cpp
+    #presentation
+    presentation/ContentPresentation.cpp
+    presentation/ContentPresentationModelViewNode.cpp
+    presentation/ContentPresentationNode.cpp
+    presentation/ContentPresentationReferenceNode.cpp
+    presentation/ContentPresentationResource.cpp
+    presentation/ContentPresentationView.cpp
+    presentation/ModelScene.cpp
+    presentation/PropertyReference.cpp
+    presentation/ContentPresentationDocument.cpp
+    presentation/PackageContentPresentations.cpp
+    presentation/reader/ContentPresentationReader.cpp
+    presentation/utility/ContentPresentationContainer.cpp
+    presentation/utility/ContentPresentationNodeContainer.cpp
+    presentation/utility/ContentPresentationViewContainer.cpp
+    presentation/utility/PropertyReferenceContainer.cpp
+    #publisher
+    publisher/EmbeddedFont.cpp
+    publisher/PublishedObject.cpp
+    publisher/data/Data.cpp
+    publisher/impl/ContentElementPropertyVisitor.cpp
+    publisher/impl/DefinedObjectPropertyVisitor.cpp
+    publisher/impl/DWF6PackagePublisher.cpp
+    publisher/impl/DWFPackagePublisher.cpp
+    publisher/impl/DWFXPackagePublisher.cpp
+    publisher/impl/PublishedContentElement.cpp
+    publisher/impl/PublishedDefinedObject.cpp
+    publisher/model/IncludeSegment.cpp
+    publisher/model/Model.cpp
+    publisher/model/Segment.cpp
+    publisher/model/StyleSegment.cpp
+    publisher/plot/Plot.cpp
+    #w3dtk
+    #whiptk
+    #XAML
+    #xps
+    xps/Constants.cpp
+    xps/FixedDocument.cpp
+    xps/FixedDocumentSequence.cpp
+    xps/FixedPage.cpp
+    xps/Package.cpp
+    xps/XPSDocRefResourceExtractor.cpp
+    xps/XPSFixedDocumentResourceExtractor.cpp
+    xps/XPSFixedPageResourceExtractor.cpp
+    xps/XPSFontResourceExtractor.cpp
 )
 
-add_library(${dwf_LIBRARY} STATIC ${dwf_SRCS})
-
-target_link_libraries(${dwf_LIBRARY}
-    ${dwfdwfx_LIBRARY}
-    ${dwfopc_LIBRARY}
-    ${dwfpackage_LIBRARY}
-    ${dwfpresentation_LIBRARY}
-    ${dwfpublisher_LIBRARY}
-    ${dwfw3dtk_LIBRARY}
-    ${dwfwhiptk_LIBRARY}
-    ${dwfXAML_LIBRARY}
-)
\ No newline at end of file
+add_library(dwftk STATIC ${dwftk_SRCS})
+target_link_libraries(dwftk dwfcore)
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/XAML/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/XAML/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/XAML/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,8 +1,6 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..
                     ${CMAKE_CURRENT_SOURCE_DIR}/../../dwf)
 
-set (dwfXAML_LIBRARY dwfXAML-${DWF_VERSION})
-
 set (dwfXAML_SRCS
     pch.cpp
     XamlArcSegment.cpp
@@ -83,4 +81,4 @@
 
 add_definitions(-DWHIP_USE_WCHAR_STRINGS)
 
-add_library(${dwfXAML_LIBRARY} STATIC ${dwfXAML_SRCS})
\ No newline at end of file
+add_library(dwfXAML STATIC ${dwfXAML_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/dwfx/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/dwfx/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/dwfx/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,27 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-add_subdirectory(reader)
-
-set (dwfdwfx_LIBRARY dwfdwfx-${DWF_VERSION})
-
-set (dwfdwfx_SRCS
-    Constants.cpp
-    ContentPart.cpp
-    CustomProperties.cpp
-    DocumentPresentationsPart.cpp
-    DWFDocument.cpp
-    DWFDocumentSequence.cpp
-    DWFProperties.cpp
-    DWFSection.cpp
-    FixedDocument.cpp
-    FixedDocumentSequence.cpp
-    FixedPage.cpp
-    Package.cpp
-    ResourcePart.cpp
-)
-
-add_library(${dwfdwfx_LIBRARY} STATIC ${dwfdwfx_SRCS})
-
-target_link_libraries(${dwfdwfx_LIBRARY}
-    ${dwfdwfxreader_LIBRARY}
-)
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/dwfx/reader/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/dwfx/reader/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/dwfx/reader/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,12 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfdwfxreader_LIBRARY dwfdwfxreader-${DWF_VERSION})
-
-set (dwfdwfxreader_SRCS
-    CustomPropertiesReader.cpp
-    DWFDocumentSequenceReader.cpp
-    DWFPropertiesReader.cpp
-    FixedPageResourceExtractor.cpp
-)
-
-add_library(${dwfdwfxreader_LIBRARY} STATIC ${dwfdwfxreader_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/opc/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/opc/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/opc/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,27 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-add_subdirectory(reader)
-
-set (dwfopc_LIBRARY dwfopc-${DWF_VERSION})
-
-set (dwfopc_SRCS
-    Constants.cpp
-    ContentTypes.cpp
-    CoreProperties.cpp
-    Package.cpp
-    Part.cpp
-    PartContainer.cpp
-    PhysicalLayerReader.cpp
-    PhysicalLayerWriter.cpp
-    Relationship.cpp
-    RelationshipContainer.cpp
-    XMLPart.cpp
-    ZipFileReader.cpp
-    ZipWriter.cpp
-)
-
-add_library(${dwfopc_LIBRARY} STATIC ${dwfopc_SRCS})
-
-target_link_libraries(${dwfopc_LIBRARY}
-    ${dwfopcreader_LIBRARY}
-)
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/opc/reader/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/opc/reader/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/opc/reader/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,10 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfopcreader_LIBRARY dwfopcreader-${DWF_VERSION})
-
-set (dwfopcreader_SRCS
-    CorePropertiesReader.cpp
-    RelationshipContainerReader.cpp
-)
-
-add_library(${dwfopcreader_LIBRARY} STATIC ${dwfopcreader_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,56 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-add_subdirectory(reader)
-add_subdirectory(utility)
-add_subdirectory(writer)
-
-set (dwfpackage_LIBRARY dwfpackage-${DWF_VERSION})
-
-set (dwfpackage_SRCS
-    Class.cpp
-    Constants.cpp
-    Content.cpp
-    ContentElement.cpp
-    ContentManager.cpp
-    CoordinateSystem.cpp
-    CustomSection.cpp
-    DataSection.cpp
-    DefinedObject.cpp
-    EModelSection.cpp
-    Entity.cpp
-    EPlotSection.cpp
-    Feature.cpp
-    FontResource.cpp
-    GlobalSection.cpp
-    GraphicResource.cpp
-    Group.cpp
-    Instance.cpp
-    Interface.cpp
-    Manifest.cpp
-    Object.cpp
-    ObjectDefinition.cpp
-    ObjectDefinitionResource.cpp
-    Paper.cpp
-    Property.cpp
-    PropertySet.cpp
-    Resource.cpp
-    Section.cpp
-    SectionBuilder.cpp
-    SectionContentResource.cpp
-    Signature.cpp
-    SignatureRequest.cpp
-    SignatureResource.cpp
-    SignatureSection.cpp
-    Source.cpp
-    Units.cpp
-    X509.cpp
-    XML.cpp
-)
-
-add_library(${dwfpackage_LIBRARY} STATIC ${dwfpackage_SRCS})
-
-target_link_libraries(${dwfpackage_LIBRARY}
-    ${dwfpackagereader_LIBRARY}
-    ${dwfpackageutility_LIBRARY}
-    ${dwfpackagewriter_LIBRARY}
-)
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/reader/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/reader/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/reader/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,21 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfpackagereader_LIBRARY dwfpackagereader-${DWF_VERSION})
-
-set (dwfpackagereader_SRCS
-    ContentReader.cpp
-    ContentResourceReader.cpp
-    DataSectionDescriptorReader.cpp
-    DuplicateAttributeFilter.cpp
-    EModelSectionDescriptorReader.cpp
-    EPlotSectionDescriptorReader.cpp
-    GlobalSectionDescriptorReader.cpp
-    ObjectDefinitionReader.cpp
-    PackageManifestReader.cpp
-    PackageReader.cpp
-    SectionDescriptorReader.cpp
-    SignatureReader.cpp
-    SignatureSectionDescriptorReader.cpp
-)
-
-add_library(${dwfpackagereader_LIBRARY} STATIC ${dwfpackagereader_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/utility/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/utility/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/utility/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,12 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfpackageutility_LIBRARY dwfpackageutility-${DWF_VERSION})
-
-set (dwfpackageutility_SRCS
-    DefinedObjectContainer.cpp
-    DWFPackageFileDescriptor.cpp
-    PropertyContainer.cpp
-    ResourceContainer.cpp
-)
-
-add_library(${dwfpackageutility_LIBRARY} STATIC ${dwfpackageutility_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,13 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-add_subdirectory(extensions)
-
-set (dwfpackagewriter_LIBRARY dwfpackagewriter-${DWF_VERSION})
-
-set (dwfpackagewriter_SRCS
-    DWF6PackageWriter.cpp
-    DWFXPackageWriter.cpp
-    PackageWriter.cpp
-)
-
-add_library(${dwfpackagewriter_LIBRARY} STATIC ${dwfpackagewriter_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.0/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.0/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.0/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,9 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../..)
-
-set (dwfpackagewriterextensions60_LIBRARY dwfpackagewriterextensions60-${DWF_VERSION})
-
-set (dwfpackagewriterextensions60_SRCS
-    PackageVersionExtension60.cpp
-)
-
-add_library(${dwfpackagewriterextensions60_LIBRARY} STATIC ${dwfpackagewriterextensions60_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.01/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.01/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.01/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,9 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../..)
-
-set (dwfpackagewriterextensions601_LIBRARY dwfpackagewriterextensions601-${DWF_VERSION})
-
-set (dwfpackagewriterextensions601_SRCS
-    PackageVersionExtension601.cpp
-)
-
-add_library(${dwfpackagewriterextensions601_LIBRARY} STATIC ${dwfpackagewriterextensions601_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.11/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.11/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.11/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,9 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../..)
-
-set (dwfpackagewriterextensions611_LIBRARY dwfpackagewriterextensions611-${DWF_VERSION})
-
-set (dwfpackagewriterextensions611_SRCS
-    PackageVersionExtension611.cpp
-)
-
-add_library(${dwfpackagewriterextensions611_LIBRARY} STATIC ${dwfpackagewriterextensions611_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.20/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.20/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/6.20/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,9 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../..)
-
-set (dwfpackagewriterextensions620_LIBRARY dwfpackagewriterextensions620-${DWF_VERSION})
-
-set (dwfpackagewriterextensions620_SRCS
-    PackageVersionExtension620.cpp
-)
-
-add_library(${dwfpackagewriterextensions620_LIBRARY} STATIC ${dwfpackagewriterextensions620_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/package/writer/extensions/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,4 +0,0 @@
-add_subdirectory(6.0)
-add_subdirectory(6.01)
-add_subdirectory(6.11)
-add_subdirectory(6.20)
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,26 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-add_subdirectory(reader)
-add_subdirectory(utility)
-
-set (dwfpresentation_LIBRARY dwfpresentation-${DWF_VERSION})
-
-set (dwfpresentation_SRCS
-    ContentPresentation.cpp
-    ContentPresentationModelViewNode.cpp
-    ContentPresentationNode.cpp
-    ContentPresentationReferenceNode.cpp
-    ContentPresentationResource.cpp
-    ContentPresentationView.cpp
-    ModelScene.cpp
-    PropertyReference.cpp
-    ContentPresentationDocument.cpp
-    PackageContentPresentations.cpp
-)
-
-add_library(${dwfpresentation_LIBRARY} STATIC ${dwfpresentation_SRCS})
-
-target_link_libraries(${dwfpresentation_LIBRARY}
-    ${dwfpresentationreader_LIBRARY}
-    ${dwfpresentationutility_LIBRARY}
-)
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/reader/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/reader/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/reader/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,9 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
-
-set (dwfpresentationreader_LIBRARY dwfpresentationreader-${DWF_VERSION})
-
-set (dwfpresentationreader_SRCS
-    ContentPresentationReader.cpp
-)
-
-add_library(${dwfpresentationreader_LIBRARY} STATIC ${dwfpresentationreader_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/utility/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/utility/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/presentation/utility/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,12 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
-
-set (dwfpresentationutility_LIBRARY dwfpresentationutility-${DWF_VERSION})
-
-set (dwfpresentationutility_SRCS
-    ContentPresentationContainer.cpp
-    ContentPresentationNodeContainer.cpp
-    ContentPresentationViewContainer.cpp
-    PropertyReferenceContainer.cpp
-)
-
-add_library(${dwfpresentationutility_LIBRARY} STATIC ${dwfpresentationutility_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,22 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-add_subdirectory(data)
-add_subdirectory(impl)
-add_subdirectory(model)
-add_subdirectory(plot)
-
-set (dwfpublisher_LIBRARY dwfpublisher-${DWF_VERSION})
-
-set (dwfpublisher_SRCS
-    EmbeddedFont.cpp
-    PublishedObject.cpp
-)
-
-add_library(${dwfpublisher_LIBRARY} STATIC ${dwfpublisher_SRCS})
-
-target_link_libraries(${dwfpublisher_LIBRARY}
-    ${dwfpublisherdata_LIBRARY}
-    ${dwfpublisherimpl_LIBRARY}
-    ${dwfpublishermodel_LIBRARY}
-    ${dwfpublisherplot_LIBRARY}
-)
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/data/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/data/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/data/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,9 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfpublisherdata_LIBRARY dwfpublisherdata-${DWF_VERSION})
-
-set (dwfpublisherdata_SRCS
-    Data.cpp
-)
-
-add_library(${dwfpublisherdata_LIBRARY} STATIC ${dwfpublisherdata_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/impl/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/impl/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/impl/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,15 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfpublisherimpl_LIBRARY dwfpublisherimpl-${DWF_VERSION})
-
-set (dwfpublisherimpl_SRCS
-    ContentElementPropertyVisitor.cpp
-    DefinedObjectPropertyVisitor.cpp
-    DWF6PackagePublisher.cpp
-    DWFPackagePublisher.cpp
-    DWFXPackagePublisher.cpp
-    PublishedContentElement.cpp
-    PublishedDefinedObject.cpp
-)
-
-add_library(${dwfpublisherimpl_LIBRARY} STATIC ${dwfpublisherimpl_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/model/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/model/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/model/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,12 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfpublishermodel_LIBRARY dwfpublishermodel-${DWF_VERSION})
-
-set (dwfpublishermodel_SRCS
-    IncludeSegment.cpp
-    Model.cpp
-    Segment.cpp
-    StyleSegment.cpp
-)
-
-add_library(${dwfpublishermodel_LIBRARY} STATIC ${dwfpublishermodel_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/plot/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/plot/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/publisher/plot/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,9 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfpublisherplot_LIBRARY dwfpublisherplot-${DWF_VERSION})
-
-set (dwfpublisherplot_SRCS
-    Plot.cpp
-)
-
-add_library(${dwfpublisherplot_LIBRARY} STATIC ${dwfpublisherplot_SRCS})
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,11 +1,5 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
 
-add_subdirectory(hoops)
-add_subdirectory(jpeg)
-add_subdirectory(utility)
-
-set (dwfw3dtk_LIBRARY dwfw3dtk-${DWF_VERSION})
-
 set (dwfw3dtk_SRCS
     BCompress.cpp
     BCompressData.cpp
@@ -23,12 +17,73 @@
     BPolyhedronAscii.cpp
     BOpcodeShellAscii.cpp
     BAscii.cpp
+    #hoops
+    hoops/fastlod.c
+    hoops/mxmain.c
+    hoops/mxmath.c
+    hoops/mxmetric.c
+    hoops/mxmodel.c
+    hoops/mxqslim.c
+    hoops/mxtype.c
+    hoops/shellopt.cpp
+    hoops/trialate.c
+    #jpeg
+    jpeg/jcapimin.c
+    jpeg/jcomapi.c
+    jpeg/jdcoefct.c
+    jpeg/jdpostct.c
+    jpeg/jidctred.c
+    jpeg/jcapistd.c
+    jpeg/jcparam.c
+    jpeg/jdcolor.c
+    jpeg/jdsample.c
+    jpeg/jccoefct.c
+    jpeg/jcphuff.c
+    jpeg/jddctmgr.c
+    jpeg/jdtrans.c
+    jpeg/jccolor.c
+    jpeg/jcprepct.c
+    jpeg/jdhuff.c
+    jpeg/jerror.c
+    jpeg/jcdctmgr.c
+    jpeg/jcsample.c
+    jpeg/jdinput.c
+    jpeg/jfdctflt.c
+    jpeg/jmemmgr.c
+    jpeg/jchuff.c
+    jpeg/jctrans.c
+    jpeg/jdmainct.c
+    jpeg/jfdctfst.c
+    jpeg/jcinit.c
+    jpeg/jdapimin.c
+    jpeg/jdmarker.c
+    jpeg/jfdctint.c
+    jpeg/jmemnobs.c
+    jpeg/jcmainct.c
+    jpeg/jdapistd.c
+    jpeg/jdmaster.c
+    jpeg/jidctflt.c
+    jpeg/jquant1.c
+    jpeg/jcmarker.c
+    jpeg/jdatadst.c
+    jpeg/jdmerge.c
+    jpeg/jidctfst.c
+    jpeg/jquant2.c
+    jpeg/jcmaster.c
+    jpeg/jdatasrc.c
+    jpeg/jdphuff.c
+    jpeg/jidctint.c
+    jpeg/jutils.c
+    #utility
+    utility/cache_memory_object.cpp
+    utility/huffman.cpp
+    utility/tempfile_utils.cpp
+    utility/utf_utils.cpp
+    utility/vconf.cpp
+    utility/vdlist.cpp
+    utility/vhash.cpp
+    utility/vlist.cpp
+    utility/vlogfile.cpp
 )
 
-add_library(${dwfw3dtk_LIBRARY} STATIC ${dwfw3dtk_SRCS})
-
-target_link_libraries(${dwfw3dtk_LIBRARY}
-    ${dwfw3dtkhoops_LIBRARY}
-    ${dwfw3dtkjpeg_LIBRARY}
-    ${dwfw3dtkutility_LIBRARY}
-)
\ No newline at end of file
+add_library(dwfw3dtk STATIC ${dwfw3dtk_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,17 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfw3dtkhoops_LIBRARY dwfw3dtkhoops-${DWF_VERSION})
-
-set (dwfw3dtkhoops_SRCS
-    fastlod.c
-    mxmain.c
-    mxmath.c
-    mxmetric.c
-    mxmodel.c
-    mxqslim.c
-    mxtype.c
-    shellopt.cpp
-    trialate.c
-)
-
-add_library(${dwfw3dtkhoops_LIBRARY} STATIC ${dwfw3dtkhoops_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/jpeg/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/jpeg/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/jpeg/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,54 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfw3dtkjpeg_LIBRARY dwfw3dtkjpeg-${DWF_VERSION})
-
-set (dwfw3dtkjpeg_SRCS
-    jcapimin.c
-    jcomapi.c
-    jdcoefct.c
-    jdpostct.c
-    jidctred.c
-    jcapistd.c
-    jcparam.c
-    jdcolor.c
-    jdsample.c
-    jccoefct.c
-    jcphuff.c
-    jddctmgr.c
-    jdtrans.c
-    jccolor.c
-    jcprepct.c
-    jdhuff.c
-    jerror.c
-    jcdctmgr.c
-    jcsample.c
-    jdinput.c
-    jfdctflt.c
-    jmemmgr.c
-    jchuff.c
-    jctrans.c
-    jdmainct.c
-    jfdctfst.c
-    jcinit.c
-    jdapimin.c
-    jdmarker.c
-    jfdctint.c
-    jmemnobs.c
-    jcmainct.c
-    jdapistd.c
-    jdmaster.c
-    jidctflt.c
-    jquant1.c
-    jcmarker.c
-    jdatadst.c
-    jdmerge.c
-    jidctfst.c
-    jquant2.c
-    jcmaster.c
-    jdatasrc.c
-    jdphuff.c
-    jidctint.c
-    jutils.c
-)
-
-add_library(${dwfw3dtkjpeg_LIBRARY} STATIC ${dwfw3dtkjpeg_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/utility/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/utility/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/utility/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,17 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-
-set (dwfw3dtkutility_LIBRARY dwfw3dtkutility-${DWF_VERSION})
-
-set (dwfw3dtkutility_SRCS
-    cache_memory_object.cpp
-    huffman.cpp
-    tempfile_utils.cpp
-    utf_utils.cpp
-    vconf.cpp
-    vdlist.cpp
-    vhash.cpp
-    vlist.cpp
-    vlogfile.cpp
-)
-
-add_library(${dwfw3dtkutility_LIBRARY} STATIC ${dwfw3dtkutility_SRCS})
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/whiptk/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/whiptk/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/whiptk/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,8 +1,6 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..
                     ${CMAKE_CURRENT_SOURCE_DIR}/../../dwf)
 
-set (dwfwhiptk_LIBRARY dwfwhiptk-${DWF_VERSION})
-
 set (dwfwhiptk_SRCS
     assert.cpp
     attribute.cpp
@@ -111,4 +109,5 @@
     w2d_class_factory.cpp
 )
 
-add_library(${dwfwhiptk_LIBRARY} STATIC ${dwfwhiptk_SRCS})
\ No newline at end of file
+add_library(dwfwhiptk STATIC ${dwfwhiptk_SRCS})
+target_link_libraries(dwfwhiptk dwfcore)
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/xps/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/xps/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/xps/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,17 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfxps_LIBRARY dwfxps-${DWF_VERSION})
-
-set (dwfxps_SRCS
-    Constants.cpp
-    FixedDocument.cpp
-    FixedDocumentSequence.cpp
-    FixedPage.cpp
-    Package.cpp
-    XPSDocRefResourceExtractor.cpp
-    XPSFixedDocumentResourceExtractor.cpp
-    XPSFixedPageResourceExtractor.cpp
-    XPSFontResourceExtractor.cpp
-)
-
-add_library(${dwfxps_LIBRARY} STATIC ${dwfxps_SRCS})
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,27 +1,5 @@
-project(dwfcore)
-
-set (DWFCORE_VERSION_MAJOR 1)
-set (DWFCORE_VERSION_MINOR 7)
-set (DWFCORE_VERSION_REV 0)
-set (DWFCORE_VERSION "${DWFCORE_VERSION_MAJOR}.${DWFCORE_VERSION_MINOR}.${DWFCORE_VERSION_REV}")
-
-add_subdirectory(ansi)
-add_subdirectory(crypto)
-add_subdirectory(digest)
-add_subdirectory(expat)
-add_subdirectory(mac)
-add_subdirectory(paging)
-add_subdirectory(sqlite)
-add_subdirectory(utility)
-add_subdirectory(x64)
-add_subdirectory(x86)
-add_subdirectory(zip)
-add_subdirectory(zlib)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-set (dwfcore_LIBRARY dwfcore-${DWFCORE_VERSION})
-
 set (dwfcore_SRCS
     BufferInputStream.cpp
     BufferOutputStream.cpp
@@ -50,21 +28,84 @@
     XMLParser.cpp
     ZipFileDescriptor.cpp
     ZippingOutputStream.cpp
+    #ansi
+    ansi/Core.cpp
+    ansi/Mutex.cpp
+    ansi/Semaphore.cpp
+    ansi/Signal.cpp
+    ansi/StandardFileDescriptor.cpp
+    ansi/StreamFileDescriptor.cpp
+    ansi/String.cpp
+    ansi/TempFile.cpp
+    ansi/Thread.cpp
+    ansi/UUID.cpp
+    #crypto
+    crypto/AsymmetricAlgorithm.cpp
+    crypto/CryptoEngine.cpp
+    crypto/CryptoEngineProvider.cpp
+    crypto/CryptoKeyGeneratorProvider.cpp
+    crypto/DigestEngine.cpp
+    crypto/SymmetricCipher.cpp
+    crypto/X509Certificate.cpp
+    #digest
+    digest/md5.c
+    digest/sha1.c
+    #expat
+    expat/xmlparse.c
+    expat/xmlrole.c
+    expat/xmltok.c
+    #mac
+    mac/Core.cpp
+    mac/Timer.cpp
+    #paging
+    paging/FileAdapter.cpp
+    paging/MemoryManager.cpp
+    paging/PagingStrategy.cpp
+    paging/SqlAdapter.cpp
+    #sqlite
+    sqlite/sqlite3.c
+    #utility
+    utility/XMLCompatibilityContext.cpp
+    utility/XMLCompatibilityPP.cpp
+    utility/XMLCompatibilityProcessChoices.cpp
+    utility/XMLCompatibilityProcessConsider.cpp
+    utility/XMLCompatibilityProcessIgnore.cpp
+    utility/XMLCompatibilityProcessStandard.cpp
+    utility/XMLCompatibilityStack.cpp
+    utility/XMLCompatibilityStreamFilter.cpp
+    utility/XMLIdentityWriter.cpp
+    utility/XMLNamespaceCollection.cpp
+    utility/XMLQualifiedNameCollection.cpp
+    #x64
+    x64/Core.cpp
+    x64/Timer.cpp
+    #x86
+    x86/Core.cpp
+    x86/Timer.cpp
+    #zip
+    zip/gvmat32c.cpp
+    zip/password.cpp
+    zip/unzip.cpp
+    zip/zip.cpp
+    #zlib
+    zlib/adler32.c
+    zlib/compress.c
+    zlib/crc32.c
+    zlib/deflate.c
+    zlib/infblock.c
+    zlib/infcodes.c
+    zlib/inffast.c
+    zlib/inflate.c
+    zlib/inftrees.c
+    zlib/infutil.c
+    zlib/maketree.c
+    zlib/trees.c
+    zlib/uncompr.c
+    zlib/zutil.c
 )
 
-add_library(${dwfcore_LIBRARY} STATIC ${dwfcore_SRCS})
-
-target_link_libraries(${dwfcore_LIBRARY}
-    ${dwfcoreansi_LIBRARY}
-    ${dwfcorecrypto_LIBRARY}
-    ${dwfcoredigest_LIBRARY}
-    ${dwfcoreexpat_LIBRARY}
-    ${dwfcoremac_LIBRARY}
-    ${dwfcorepaging_LIBRARY}
-    ${dwfcoresqlite_LIBRARY}
-    ${dwfcoreutility_LIBRARY}
-    ${dwfcorex64_LIBRARY}
-    ${dwfcorex86_LIBRARY}
-    ${dwfcoreazip_LIBRARY}
-    ${dwfcoreazlib_LIBRARY}
+add_library(dwfcore STATIC ${dwfcore_SRCS})
+target_link_libraries(dwfcore
+    dl
+    pthread
 )
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/ansi/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/ansi/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/ansi/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,18 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcoreansi_LIBRARY dwfcoreansi-${DWFCORE_VERSION})
-
-set (dwfcoreansi_SRCS
-    Core.cpp
-    Mutex.cpp
-    Semaphore.cpp
-    Signal.cpp
-    StandardFileDescriptor.cpp
-    StreamFileDescriptor.cpp
-    String.cpp
-    TempFile.cpp
-    Thread.cpp
-    UUID.cpp
-)
-
-add_library(${dwfcoreansi_LIBRARY} STATIC ${dwfcoreansi_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/crypto/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/crypto/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/crypto/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,15 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcorecrypto_LIBRARY dwfcorecrypto-${DWFCORE_VERSION})
-
-set (dwfcorecrypto_SRCS
-    AsymmetricAlgorithm.cpp
-    CryptoEngine.cpp
-    CryptoEngineProvider.cpp
-    CryptoKeyGeneratorProvider.cpp
-    DigestEngine.cpp
-    SymmetricCipher.cpp
-    X509Certificate.cpp
-)
-
-add_library(${dwfcorecrypto_LIBRARY} STATIC ${dwfcorecrypto_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/digest/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/digest/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/digest/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,10 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcoredigest_LIBRARY dwfcoredigest-${DWFCORE_VERSION})
-
-set (dwfcoredigest_SRCS
-    md5.c
-    sha1.c
-)
-
-add_library(${dwfcoredigest_LIBRARY} STATIC ${dwfcoredigest_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/expat/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/expat/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/expat/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,11 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcoreexpat_LIBRARY dwfcoreexpat-${DWFCORE_VERSION})
-
-set (dwfcoreexpat_SRCS
-    xmlparse.c
-    xmlrole.c
-    xmltok.c
-)
-
-add_library(${dwfcoreexpat_LIBRARY} STATIC ${dwfcoreexpat_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/mac/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/mac/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/mac/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,10 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcoremac_LIBRARY dwfcoremac-${DWFCORE_VERSION})
-
-set (dwfcoremac_SRCS
-    Core.cpp
-    Timer.cpp
-)
-
-add_library(${dwfcoremac_LIBRARY} STATIC ${dwfcoremac_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/paging/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/paging/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/paging/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,12 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcorepaging_LIBRARY dwfcorepaging-${DWFCORE_VERSION})
-
-set (dwfcorepaging_SRCS
-    FileAdapter.cpp
-    MemoryManager.cpp
-    PagingStrategy.cpp
-    SqlAdapter.cpp
-)
-
-add_library(${dwfcorepaging_LIBRARY} STATIC ${dwfcorepaging_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/sqlite/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/sqlite/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/sqlite/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,9 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcoresqlite_LIBRARY dwfcoresqlite-${DWFCORE_VERSION})
-
-set (dwfcoresqlite_SRCS
-    sqlite3.c
-)
-
-add_library(${dwfcoresqlite_LIBRARY} STATIC ${dwfcoresqlite_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/utility/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/utility/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/utility/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,19 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcoreutility_LIBRARY dwfcoreutility-${DWFCORE_VERSION})
-
-set (dwfcoreutility_SRCS
-    XMLCompatibilityContext.cpp
-    XMLCompatibilityPP.cpp
-    XMLCompatibilityProcessChoices.cpp
-    XMLCompatibilityProcessConsider.cpp
-    XMLCompatibilityProcessIgnore.cpp
-    XMLCompatibilityProcessStandard.cpp
-    XMLCompatibilityStack.cpp
-    XMLCompatibilityStreamFilter.cpp
-    XMLIdentityWriter.cpp
-    XMLNamespaceCollection.cpp
-    XMLQualifiedNameCollection.cpp
-)
-
-add_library(${dwfcoreutility_LIBRARY} STATIC ${dwfcoreutility_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/x64/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/x64/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/x64/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,10 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcorex64_LIBRARY dwfcorex64-${DWFCORE_VERSION})
-
-set (dwfcorex64_SRCS
-    Core.cpp
-    Timer.cpp
-)
-
-add_library(${dwfcorex64_LIBRARY} STATIC ${dwfcorex64_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/x86/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/x86/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/x86/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,10 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcorex86_LIBRARY dwfcorex86-${DWFCORE_VERSION})
-
-set (dwfcorex86_SRCS
-    Core.cpp
-    Timer.cpp
-)
-
-add_library(${dwfcorex86_LIBRARY} STATIC ${dwfcorex86_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/zip/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/zip/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/zip/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,12 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcorezip_LIBRARY dwfcorezip-${DWFCORE_VERSION})
-
-set (dwfcorezip_SRCS
-    gvmat32c.cpp
-    password.cpp
-    unzip.cpp
-    zip.cpp
-)
-
-add_library(${dwfcorezip_LIBRARY} STATIC ${dwfcorezip_SRCS})
\ No newline at end of file

Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/zlib/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/zlib/CMakeLists.txt	2017-12-23 16:52:17 UTC (rev 9260)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/zlib/CMakeLists.txt	2017-12-25 01:12:07 UTC (rev 9261)
@@ -1,22 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfcorezlib_LIBRARY dwfcorezlib-${DWFCORE_VERSION})
-
-set (dwfcorezlib_SRCS
-    adler32.c
-    compress.c
-    crc32.c
-    deflate.c
-    infblock.c
-    infcodes.c
-    inffast.c
-    inflate.c
-    inftrees.c
-    infutil.c
-    maketree.c
-    trees.c
-    uncompr.c
-    zutil.c
-)
-
-add_library(${dwfcorezlib_LIBRARY} STATIC ${dwfcorezlib_SRCS})
\ No newline at end of file

