Changeset 1f41f130 in tol

Timestamp:

Dec 30, 2015, 8:12:28 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

0ca91a5

Parents:

2328789

Message:

refs #1904, #1905, en linux enlazamos libtol.so al proceso principal para resolver, toltcl encontrará sus simbolos en memoria cuando se cargue

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7161 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolbase/generic

Files:

• CMakeLists.txt (modified) (2 diffs)
• tolbase.c (modified) (2 diffs)

tolbase/generic/CMakeLists.txt

@@ -1 +1 @@
 add_definitions( -DTCL_THREADS -DTOLBASE_VERSION=\"${TOLBASE_VERSION_MAJOR}.${TOLBASE_VERSION_MINOR}\")
-include_directories( ${TCL_INCLUDE_PATH} )
+include_directories( ${TCL_INCLUDE_PATH} ${TOL_INCLUDE_DIR} )
  
 message( STATUS "Using TCL_INCLUDE_PATH = ${TCL_INCLUDE_PATH}" )
@@ -24 +24 @@
 add_executable( tolbase tolbase.c ${RES_FILES})
 
-target_link_libraries( tolbase ${TCL_LIBRARY} ${TK_LIBRARY} )
+if( WIN32 )
+  target_link_libraries( tolbase ${TCL_LIBRARY} ${TK_LIBRARY} )
+else( WIN32 )
+  target_link_libraries( tolbase ${TCL_LIBRARY} ${TK_LIBRARY} ${TOL_LIBRARY} )
+endif( WIN32 )
 
 message( STATUS "TOLBASE_DEST_DIR = ${TOLBASE_DEST_DIR}" )

tolbase/generic/tolbase.c

@@ -16 +16 @@
 #ifdef WIN32
 #include <windows.h>
+#else
+#include "tol/tol_init.h"
 #endif
 
@@ -101 +103 @@
 #endif
 
+    const char * version = TOLVersion();
     Tk_Main(argc, argv, TK_LOCAL_APPINIT);
     return 0;                   /* Needed only to prevent compiler warning. */