Revision: 42063
http://brlcad.svn.sourceforge.net/brlcad/?rev=42063&view=rev
Author: starseeker
Date: 2011-01-10 21:47:16 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
Tweak building of tkhtml for Windows
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt 2011-01-10
21:28:19 UTC (rev 42062)
+++ brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt 2011-01-10
21:47:16 UTC (rev 42063)
@@ -20,7 +20,7 @@
# Windows specific flags
IF(WIN32)
- SET(TKHTML_CFLAGS "${TKHTML_CFLAGS} -c -W3 -D _CRT_SECURE_NO_DEPRECATE
-D _CRT_NONSTDC_NO_DEP -Ot -Oi -fp:strict -Gs -GS -GL -MD")
+ SET(TKHTML_CFLAGS "${TKHTML_CFLAGS} -c -W3 -D _CRT_SECURE_NO_DEPRECATE
-D _CRT_NONSTDC_NO_DEP -Ot -Oi -fp:strict -Gs -GS -GL -MD -DUSE_TCL_STUBS
-DUSE_TK_STUBS -D__WIN32__")
SET(TKHTML_CFLAGS "${TKHTML_CFLAGS} -Dinline=__inline -DBUILD_tkhtml")
ENDIF(WIN32)
@@ -65,13 +65,16 @@
src/htmltext.c
src/htmltree.c
src/htmlutil.c
- src/main.c
src/restrack.c
src/swproc.c
)
add_library(Tkhtml SHARED ${TKHTML_SRCS})
-target_link_libraries(Tkhtml ${TCL_LIBRARY} ${TCL_TK_LIBRARY}
${TCL_STUB_LIBRARIES} ${X11_LIBRARIES})
+IF(WIN32)
+ target_link_libraries(Tkhtml ${TCL_STUB_LIBRARIES} ${X11_LIBRARIES})
+ELSE(WIN32)
+ target_link_libraries(Tkhtml ${TCL_LIBRARY} ${TCL_TK_LIBRARY}
${TCL_STUB_LIBRARIES} ${X11_LIBRARIES})
+ENDIF(WIN32)
install(TARGETS Tkhtml DESTINATION lib)
# Create the pkgIndex.tcl file.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
