Revision: 41734
http://brlcad.svn.sourceforge.net/brlcad/?rev=41734&view=rev
Author: starseeker
Date: 2010-12-21 01:39:10 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Getting closer on Windows. Irritatingly, the dlls are being put in bin not lib
even after adding the extra config redircts (need to generalize that along
these lines: http://forum.openscenegraph.org/viewtopic.php?t=6926) so all of
the pkgIndex.tcl scripts being generated will have to be customized to look for
their dlls in ../../bin on Windows."
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/bwish/CMakeLists.txt
brlcad/branches/cmake/src/bwish/cadAppInit.c
brlcad/branches/cmake/src/mged/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-12-20 21:13:48 UTC (rev
41733)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-12-21 01:39:10 UTC (rev
41734)
@@ -280,12 +280,18 @@
# files will be placed after building but prior to install.
IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BRLCAD_BINARY_DIR}/lib CACHE
INTERNAL "Single output directory for building all libraries.")
+ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${BRLCAD_BINARY_DIR}/lib CACHE
INTERNAL "Single output directory for building all libraries.")
+ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${BRLCAD_BINARY_DIR}/lib
CACHE INTERNAL "Single output directory for building all libraries.")
ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
IF(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BRLCAD_BINARY_DIR}/lib CACHE
INTERNAL "Single output directory for building all archives.")
+ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${BRLCAD_BINARY_DIR}/lib CACHE
INTERNAL "Single output directory for building all archives.")
+ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${BRLCAD_BINARY_DIR}/lib
CACHE INTERNAL "Single output directory for building all archives.")
ENDIF(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
IF(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BRLCAD_BINARY_DIR}/bin CACHE
INTERNAL "Single output directory for building all executables.")
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${BRLCAD_BINARY_DIR}/bin CACHE
INTERNAL "Single output directory for building all executables.")
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${BRLCAD_BINARY_DIR}/bin
CACHE INTERNAL "Single output directory for building all executables.")
ENDIF(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
#---------------------------------------------------------------------
Modified: brlcad/branches/cmake/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/bwish/CMakeLists.txt 2010-12-20 21:13:48 UTC
(rev 41733)
+++ brlcad/branches/cmake/src/bwish/CMakeLists.txt 2010-12-21 01:39:10 UTC
(rev 41734)
@@ -5,11 +5,22 @@
${TK_INCLUDE_PATH}
)
-BRLCAD_ADDEXEC(btclsh "cmd.c input.c main.c tcl.c" "libbu libtclcad libtermio")
+IF(WIN32)
+ BRLCAD_ADDEXEC(btclsh "cadAppInit.c consoleMain.c" "libtclcad libged")
+ELSE(WIN32)
+ BRLCAD_ADDEXEC(btclsh "cmd.c input.c main.c tcl.c" "libbu libtclcad
libtermio")
+ENDIF(WIN32)
IF(BRLCAD-ENABLE_TK)
- BRLCAD_ADDEXEC(bwish "cmd.c input.c main.c tcl.c" "libtclcad libdm
libtermio ${X11_LIBRARIES} ${X11_Xi_LIB} libdm")
- SET_TARGET_PROPERTIES(bwish PROPERTIES COMPILE_DEFINITIONS "BWISH=1")
+ IF(WIN32)
+ add_executable(bwish WIN32 cadAppInit.c winMain.c)
+ target_link_libraries(bwish libtclcad libdm imm32.lib
comctl32.lib)
+ install(TARGETS bwish RUNTIME DESTINATION
${BRLCAD_INSTALL_BIN_DIR})
+ SET_TARGET_PROPERTIES(bwish PROPERTIES COMPILE_DEFINITIONS
"BWISH=1")
+ ELSE(WIN32)
+ BRLCAD_ADDEXEC(bwish "cmd.c input.c main.c tcl.c" "libtclcad
libdm libtermio ${X11_LIBRARIES} ${X11_Xi_LIB} libdm")
+ SET_TARGET_PROPERTIES(bwish PROPERTIES COMPILE_DEFINITIONS
"BWISH=1")
+ ENDIF(WIN32)
ENDIF(BRLCAD-ENABLE_TK)
IF(ITCL_LIBRARY MATCHES "^itcl$")
Modified: brlcad/branches/cmake/src/bwish/cadAppInit.c
===================================================================
--- brlcad/branches/cmake/src/bwish/cadAppInit.c 2010-12-20 21:13:48 UTC
(rev 41733)
+++ brlcad/branches/cmake/src/bwish/cadAppInit.c 2010-12-21 01:39:10 UTC
(rev 41734)
@@ -31,10 +31,10 @@
#endif
#include "bio.h"
-#include "itcl.h"
+#include "tcl.h"
#ifdef BWISH
-# include "itk.h"
+# include "tk.h"
# include "dm.h"
# include "fb.h"
#endif
@@ -58,16 +58,16 @@
/* Locate the BRL-CAD-specific Tcl scripts, set the auto_path */
tclcad_auto_path(interp);
-/* Initialize [incr Tcl] */
- if (Itcl_Init(interp) == TCL_ERROR) {
- bu_log("Itcl_Init ERROR:\n%s\n", Tcl_GetStringResult(interp));
+ /* Initialize Itcl */
+ if (Tcl_Eval(interp, "package require Itcl") != TCL_OK) {
+ bu_log("Tcl_Eval ERROR:\n%s\n", Tcl_GetStringResult(interp));
return TCL_ERROR;
}
#ifdef BWISH
-/* Initialize [incr Tk] */
- if (Itk_Init(interp) == TCL_ERROR) {
- bu_log("Itk_Init ERROR:\n%s\n", Tcl_GetStringResult(interp));
+ /* Initialize Itk */
+ if (Tcl_Eval(interp, "package require Itk") != TCL_OK) {
+ bu_log("Tcl_Eval ERROR:\n%s\n", Tcl_GetStringResult(interp));
return TCL_ERROR;
}
#endif
@@ -82,7 +82,11 @@
#endif /* IMPORT_ITCL */
#ifdef BWISH
-
+ /* Initialize Itk */
+ if (Tcl_Eval(interp, "package require Itk") != TCL_OK) {
+ bu_log("Tcl_Eval ERROR:\n%s\n", Tcl_GetStringResult(interp));
+ return TCL_ERROR;
+ }
# ifdef IMPORT_ITK
/* Import [incr Tk] commands into the global namespace */
if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp),
Modified: brlcad/branches/cmake/src/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/mged/CMakeLists.txt 2010-12-20 21:13:48 UTC
(rev 41733)
+++ brlcad/branches/cmake/src/mged/CMakeLists.txt 2010-12-21 01:39:10 UTC
(rev 41734)
@@ -5,7 +5,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/points
${TERMLIB_INCLUDE_DIR}
${PNG_INCLUDE_DIR}
${X11_INCLUDE_DIR}
@@ -15,6 +14,13 @@
${TK_INCLUDE_PATH}
)
+# process.h in points dir makes Windows unhappy
+IF(NOT WIN32)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/points
+ )
+ENDIF(NOT WIN32)
+
IF(WIN32 AND BRLCAD-ENABLE_OPENGL)
SET(MGED_DM_SOURCES "${MGED_DM_SOURCES};dm-wgl.c")
SET(MGED_DEFINES "${MGED_DEFINES} -DDM_WGL -DIF_WGL")
@@ -100,10 +106,16 @@
usepen.c
utility1.c
vparse.c
- vrlink.c
)
+IF(NOT WIN32)
+ SET(MGED_SOURCES ${MGED_SOURCES} vrlink.c)
+ENDIF(NOT WIN32)
-BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm libtermio
${pointstarget}")
+IF(NOT WIN32)
+ BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm
libtermio ${pointstarget}")
+ELSE(NOT WIN32)
+ BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm
ws2_32.lib opengl32.lib")
+ENDIF(NOT WIN32)
BRLCAD_ADDEXEC(cad_boundp cad_boundp.c libbu)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
