Fixed problems with undefined _O_TEXT and linking math libraries

mdykman · Feb 3, 2012 · ae0d7b8 · ae0d7b8
1 parent 3827ef6
commit ae0d7b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,8 +24,7 @@ set(libtsdll_SRCS
     tsdll.c)
 
 if(UNIX)
-    set(jconsole_LIBS
-        m)
+    link_libraries(m)
 endif()
 
 if(NOT DATA_INSTALL_PREFIX)

diff --git a/jconsole.c b/jconsole.c
@@ -146,7 +146,10 @@ int main(int argc, char* argv[])
 	 type=0;
  addargv(argc,argv,input+strlen(input));
 #ifndef READLINE
+// _O_TEXT may not be defined on non-VC++ systems
+#ifdef _O_TEXT
  _setmode( _fileno( stdin ), _O_TEXT ); //readline filters '\r' (so does this)
+#endif
 #endif
  jefirst(type,input);
  while(1){jedo(Jinput(jt,"   "));}