Revision: 42243
http://brlcad.svn.sourceforge.net/brlcad/?rev=42243&view=rev
Author: starseeker
Date: 2011-01-13 14:58:30 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
Restore some CMake branch tweaks I wiped out with the previous update.
Modified Paths:
--------------
brlcad/branches/cmake/src/gtools/g_diff.c
brlcad/branches/cmake/src/tclscripts/archer/LoadArcherLibs.tcl
Modified: brlcad/branches/cmake/src/gtools/g_diff.c
===================================================================
--- brlcad/branches/cmake/src/gtools/g_diff.c 2011-01-13 14:47:14 UTC (rev
42242)
+++ brlcad/branches/cmake/src/gtools/g_diff.c 2011-01-13 14:58:30 UTC (rev
42243)
@@ -972,7 +972,6 @@
Tcl_FindExecutable(argv[0]);
interp = Tcl_CreateInterp();
tclcad_auto_path(interp);
- tclcad_tcl_library(interp);
if (Tcl_Init(interp) == TCL_ERROR) {
bu_log("Tcl_Init failure:\n%s\n", Tcl_GetStringResult(interp));
Modified: brlcad/branches/cmake/src/tclscripts/archer/LoadArcherLibs.tcl
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/LoadArcherLibs.tcl
2011-01-13 14:47:14 UTC (rev 42242)
+++ brlcad/branches/cmake/src/tclscripts/archer/LoadArcherLibs.tcl
2011-01-13 14:58:30 UTC (rev 42243)
@@ -29,26 +29,6 @@
proc LoadArcherCoreLibs {} {
global tcl_platform
- # load tkpng
- if {$tcl_platform(platform) == "windows"} {
- set ext "dll"
- set tkpngdir [bu_brlcad_root "bin"]
- } else {
- set ext "so"
- set tkpngdir [bu_brlcad_root "lib"]
- if {![file exists $tkpngdir]} {
- set tkpngdir [file join [bu_brlcad_data "src"] other tkpng .libs]
- }
- }
-
- # can't use sharedlibextension without changing tkpng build
- if {![file exists [file join $tkpngdir tkpng.$ext]]} {
- puts "ERROR: Unable to initialize ArcherCore imagery"
- exit 1
- }
-
- load [file join $tkpngdir tkpng.$ext]
-
if { [catch {package require Swidgets} _initialized] } {
puts "$_initialized"
puts ""
@@ -56,6 +36,9 @@
exit 1
}
+ # load tkpng
+ catch {package require tkpng} tkpng
+
# load Tkhtml
catch {package require hv3 0.1} hv3
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
