Merge branch 'iqmmodel' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 29 Jul 2017 04:13:26 +0000 (04:13 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 29 Jul 2017 04:13:26 +0000 (04:13 +0000)
import iqmmodel support from aaradiant

See merge request !62

tools/quake3/CMakeLists.txt

index a367343..511162a 100644 (file)
@@ -124,8 +124,8 @@ target_link_libraries(q3map2
         ${JPEG_LIBRARIES}
         ${PNG_LIBRARIES}
         ${LIBXML2_LIBRARIES}
-        ${ZLIB_LIBRARIES}
         ${MINIZIP_LIBRARIES}
+        ${ZLIB_LIBRARIES}
         ddslib
         etclib
         filematch
@@ -160,8 +160,8 @@ radiant_tool(q3data
 target_link_libraries(q3data
         ${GLIB_LIBRARIES}
         ${LIBXML2_LIBRARIES}
-        ${ZLIB_LIBRARIES}
         ${MINIZIP_LIBRARIES}
+        ${ZLIB_LIBRARIES}
         filematch
         etclib
         l_net