Revision: 41000
http://brlcad.svn.sourceforge.net/brlcad/?rev=41000&view=rev
Author: starseeker
Date: 2010-10-15 03:16:00 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Add defines to libutahrle, sidestep a couple src/other dirs that aren't
working. nmake gets as far as librt, but fails linking for mysterious reasons
(succeeds when doing more targeted compiles like nmake rt)
Modified Paths:
--------------
brlcad/branches/cmake/src/other/URToolkit/CMakeLists.txt
brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt
brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/URToolkit/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/URToolkit/CMakeLists.txt 2010-10-15
02:48:00 UTC (rev 40999)
+++ brlcad/branches/cmake/src/other/URToolkit/CMakeLists.txt 2010-10-15
03:16:00 UTC (rev 41000)
@@ -1,3 +1,4 @@
+IF(NOT MSVC)
MACRO(URT_EXEC execname srcs)
STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
add_executable(${execname} ${srcslist})
@@ -8,3 +9,4 @@
ADD_SUBDIRECTORY(cnv)
ADD_SUBDIRECTORY(man)
ADD_SUBDIRECTORY(tools)
+ENDIF(NOT MSVC)
Modified: brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt 2010-10-15
02:48:00 UTC (rev 40999)
+++ brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt 2010-10-15
03:16:00 UTC (rev 41000)
@@ -1,4 +1,4 @@
-
+IF(NOT MSVC)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/termcap.src
${CMAKE_CURRENT_BINARY_DIR}/termcap COPYONLY)
@@ -31,3 +31,4 @@
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/termcap DESTINATION share/etc)
+ENDIF(NOT MSVC)
Modified: brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt 2010-10-15
02:48:00 UTC (rev 40999)
+++ brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt 2010-10-15
03:16:00 UTC (rev 41000)
@@ -46,6 +46,16 @@
vaxshort.c
)
+IF(MSVC)
+ add_definitions(
+ -DRLE_EXPORT_DLL
+ -DBRLCAD_DLL
+ -DNO_DECLARE_MALLOC
+ -DNEED_BSTRING
+ -DNO_OPEN_PIPES
+ )
+ENDIF(MSVC)
+
add_library(utahrle SHARED ${LIBUTAHRLE_SOURCES})
target_link_libraries(utahrle ${M_LIBRARY})
INSTALL(TARGETS utahrle DESTINATION lib)
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
