[Scstudio-commits] SF.net SVN: scstudio:[543] trunk

[<got...@us...>]

Revision: 543
          http://scstudio.svn.sourceforge.net/scstudio/?rev=543&view=rev
Author:   gotthardp
Date:     2010-01-07 19:32:50 +0000 (Thu, 07 Jan 2010)

Log Message:
-----------
Portability enhancements.

Modified Paths:
--------------
    trunk/FindANTLR.cmake
    trunk/src/view/visio/addon/visualize.cpp

Modified: trunk/FindANTLR.cmake
===================================================================
--- trunk/FindANTLR.cmake	2010-01-05 14:02:05 UTC (rev 542)
+++ trunk/FindANTLR.cmake	2010-01-07 19:32:50 UTC (rev 543)
@@ -4,7 +4,10 @@
 ENDIF(NOT ANTLR_ROOT)
 
 FIND_FILE(ANTLR_CLASSPATH
-  NAMES antlr-3.1.1.jar
+  NAMES
+    antlr-3.1.1.jar
+    antlr-3.1.2.jar
+    antlr-3.1.3.jar
   PATHS
     ${ANTLR_ROOT}/lib
   DOC "The ANTLR class file")
@@ -13,12 +16,14 @@
   NAMES antlr3c
   PATHS
     ${ANTLR_ROOT}/runtime/C
+    ${ANTLR_ROOT}/runtime/C/Release
   DOC "The ANTLR library")
 
 FIND_LIBRARY(ANTLR_LIBRARY_DEBUG
-  NAMES antlr3c
+  NAMES antlr3cd
   PATHS
     ${ANTLR_ROOT}/runtime/C
+    ${ANTLR_ROOT}/runtime/C/Debug
   DOC "The ANTLR debug library")
 
 IF(NOT ANTLR_LIBRARY_DEBUG)

Modified: trunk/src/view/visio/addon/visualize.cpp
===================================================================
--- trunk/src/view/visio/addon/visualize.cpp	2010-01-05 14:02:05 UTC (rev 542)
+++ trunk/src/view/visio/addon/visualize.cpp	2010-01-07 19:32:50 UTC (rev 543)
@@ -22,7 +22,6 @@
 #include "errors.h"
 
 #include <math.h>
-#include <Visconst.h>
 
 CDrawingVisualizer::CDrawingVisualizer(Visio::IVApplicationPtr vsoApp)
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.