From 356337f8e0182bab96d8c762f95820f50a2f1ab8 Mon Sep 17 00:00:00 2001 From: Ed McCardell Date: Mon, 16 Apr 2012 07:47:32 -0400 Subject: [PATCH] Compile with dmd 2.059 --- README.md | 2 +- src/Makefile | 2 +- src/ui/mainwindow.d | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8ccb0b7..b123341 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ updated to work with the latest version of D on both 32- and 64-bit Linux. ### Building -twoapple-reboot works with dmd 2.058; I haven't tried it with ldc/gdc. +twoapple-reboot works with dmd 2.058/2.059; I haven't tried it with ldc/gdc. It depends on [gtkd](http://www.dsource.org/projects/gtkd) and [Derelict2](http://www.dsource.org/projects/derelict) diff --git a/src/Makefile b/src/Makefile index 74bd283..b9e86b3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -COMPILE_OPTS = -op -Jdata -I$(GTKD)/src \ +COMPILE_OPTS = -d -op -Jdata -I$(GTKD)/src \ -I$(GTKD)/srcgl -I$(DERELICT)/import \ -inline -release -O -noboundscheck \ -version=OpNestedSwitch diff --git a/src/ui/mainwindow.d b/src/ui/mainwindow.d index f2f38be..6d0e083 100644 --- a/src/ui/mainwindow.d +++ b/src/ui/mainwindow.d @@ -232,21 +232,21 @@ class TwoappleFile this(string fname) { - assert(isabs(fname) != 0); + assert(isAbsolute(fname) != 0); fileName = fname; fileNameZ = std.string.toStringz(fname); } string folder() { - return getDirName(fileName); + return dirName(fileName); } string baseName() { - string base = getName(fileName); - if (base is null) return getBaseName(fileName); - else return getBaseName(base); + string base = stripExtension(fileName); + if (base is null) return std.path.baseName(fileName); + else return std.path.baseName(base); } bool canRead()