ide: Fixed OS X/Linux build broken by d7347cce4dfa06e7e1da817c3168b5bc7e198fbd

- Must now link IDE with -lm

diff --git a/ide/Makefile b/ide/Makefile
index 86d3b1f..f223227 100644 (file)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -224,7 +224,8 @@ ifndef STATIC_LIBRARY_TARGET
 OFLAGS += \
         -L/usr/X11R6/lib
 LIBS += \
-       $(call _L,X11)
+       $(call _L,X11) \
+       $(call _L,m)
 endif
 
 else
@@ -234,7 +235,8 @@ ifndef STATIC_LIBRARY_TARGET
 OFLAGS += \
         -L/usr/X11R6/lib
 LIBS += \
-       $(call _L,X11)
+       $(call _L,X11) \
+       $(call _L,m)
 endif
 
 endif

diff --git a/ide/ide.epj b/ide/ide.epj
index 1478278..253279c 100644 (file)
--- a/ide/ide.epj
+++ b/ide/ide.epj
@@ -20,7 +20,8 @@
                "/usr/X11R6/include"
             ],
             "Libraries" : [
-               "X11"
+               "X11",
+               "m"
             ],
             "LibraryDirs" : [
                "/usr/X11R6/lib"
@@ -34,7 +35,8 @@
                "/usr/X11R6/include"
             ],
             "Libraries" : [
-               "X11"
+               "X11",
+               "m"
             ],
             "LibraryDirs" : [
                "/usr/X11R6/lib"
@@ -72,25 +74,7 @@
             "InstallCommands" : [
                "$(if $(WINDOWS_HOST),$(call cpq,$(TARGET),\"$(BINDIR)/\"),install $(INSTALL_FLAGS) $(TARGET) $(BINDIR)/$(MODULE)$(E))"
             ]
-         },
-         "Platforms" : [
-            {
-               "Name" : "linux",
-               "Options" : {
-                  "Libraries" : [
-                     "X11"
-                  ]
-               }
-            },
-            {
-               "Name" : "apple",
-               "Options" : {
-                  "Libraries" : [
-                     "X11"
-                  ]
-               }
-            }
-         ]
+         }
       },
       {
          "Name" : "MemoryGuard",

diff --git a/ide/src/debugger/debugTools.ec b/ide/src/debugger/debugTools.ec
index bad266e..fdd5439 100644 (file)
--- a/ide/src/debugger/debugTools.ec
+++ b/ide/src/debugger/debugTools.ec
@@ -1,7 +1,5 @@
 import "ide"
 
-#include <math.h>
-
 static Map<String, uintptr> oneArgFns
 { [
    { "sqrt", (uintptr)sqrt },
@@ -23,7 +21,6 @@ static Map<String, uintptr> oneArgFns
    { "floor", (uintptr)floor },
    { "ceil", (uintptr)ceil },
    { "fabs", (uintptr)sqrt }
-
 ] };
 
 static Map<String, uintptr> twoArgFns