Revision: 41056
http://brlcad.svn.sourceforge.net/brlcad/?rev=41056&view=rev
Author: starseeker
Date: 2010-10-18 19:50:52 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Try linking in some windows libraries for the symbol __imp__uuidcre...@4
error...
Modified Paths:
--------------
brlcad/branches/cmake/src/conv/iges/CMakeLists.txt
brlcad/branches/cmake/src/librt/CMakeLists.txt
brlcad/branches/cmake/src/libwdb/CMakeLists.txt
Modified: brlcad/branches/cmake/src/conv/iges/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/iges/CMakeLists.txt 2010-10-18 18:58:15 UTC
(rev 41055)
+++ brlcad/branches/cmake/src/conv/iges/CMakeLists.txt 2010-10-18 19:50:52 UTC
(rev 41056)
@@ -6,9 +6,10 @@
)
IF(MSVC)
-add_definitions(
- -DON_DLL_IMPORTS
-)
+ SET(WIN32LIBS ws2_32.lib Rpcrt4.lib)
+ add_definitions(
+ -DON_DLL_IMPORTS
+ )
ENDIF(MSVC)
add_executable(iges
@@ -17,7 +18,7 @@
n_iges.cpp
n_main.cpp
)
-target_link_libraries(iges libwdb librt libbu ${OPENNURBS_LIBRARY})
+target_link_libraries(iges libwdb librt libbu ${OPENNURBS_LIBRARY}
${WIN32LIBS})
#INSTALL(TARGETS iges RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
add_executable(iges-g
Modified: brlcad/branches/cmake/src/librt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/librt/CMakeLists.txt 2010-10-18 18:58:15 UTC
(rev 41055)
+++ brlcad/branches/cmake/src/librt/CMakeLists.txt 2010-10-18 19:50:52 UTC
(rev 41056)
@@ -235,6 +235,7 @@
)
if(MSVC)
+ SET(WIN32LIBS ws2_32.lib Rpcrt4.lib)
add_definitions(
-DON_DLL_IMPORTS
-DDB5_EXPORT_DLL
@@ -242,7 +243,7 @@
)
endif(MSVC)
-BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}" "libbn libbu ${OPENNURBS_LIBRARY}
${REGEX_LIBRARY} ${ZLIB_LIBRARY}")
+BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}" "libbn libbu ${OPENNURBS_LIBRARY}
${REGEX_LIBRARY} ${ZLIB_LIBRARY} ${WIN32LIBS}")
SET_TARGET_PROPERTIES(librt PROPERTIES VERSION 19.0.1 SOVERSION 19)
install(FILES librt.3 DESTINATION ${MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libwdb/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libwdb/CMakeLists.txt 2010-10-18 18:58:15 UTC
(rev 41055)
+++ brlcad/branches/cmake/src/libwdb/CMakeLists.txt 2010-10-18 19:50:52 UTC
(rev 41056)
@@ -31,6 +31,7 @@
)
if(MSVC)
+ SET(WIN32LIBS ws2_32.lib Rpcrt4.lib)
add_definitions(
-DOBJ_BREP=1
-DON_DLL_IMPORTS
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
