Changeset 9b614da in tol

Timestamp:

Mar 19, 2015, 2:05:07 PM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

be3dec5

Parents:

4fce39e

Message:

refs #1812, refs #1818, al enlazar tolbase.exe en windows hay que dar la opcion -mwindows para que no abra una consola del DOS

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

Location:

tolbase/generic

Files:

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

tolbase/generic/CMakeLists.txt

@@ -6 +6 @@
 message( STATUS "Using TK_LIBRARY = ${TCL_LIBRARY}" )
 
-if ( NOT WIN32 )
+if ( WIN32 )
+  set( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -mwindows" )
+else ( WIN32 )
         # use, i.e. don't skip the full RPATH for the build tree
   SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
@@ -20 +22 @@
   SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-
   # the RPATH to be used when installing, but only if it's not a system directory
   LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
@@ -26 +27 @@
      SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
   ENDIF("${isSystemDir}" STREQUAL "-1")
-endif( NOT WIN32 )
+endif( WIN32 )
 
 add_executable( tolbase tolbase.c )

tolbase/generic/tolbase.c

@@ -14 +14 @@
 #include "tk.h"
 #include "locale.h"
+#include <windows.h>
+
 
 #ifdef TK_TEST
@@ -37 +39 @@
  */
 
+#pragma comment(linker, "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
+
 int
 main(argc, argv)
@@ -53 +57 @@
 #endif
     extern int TK_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp));
+
+    //HWND hwnd = GetConsoleWindow();
+    //ShowWindow(hwnd, 0);
     
     /*