[Scummvm-cvs-logs] SF.net SVN: scummvm:[46648] tools/branches/gsoc2009-gui
sev at users.sourceforge.net
sev at users.sourceforge.net
Sun Dec 27 15:27:36 CET 2009
Revision: 46648
http://scummvm.svn.sourceforge.net/scummvm/?rev=46648&view=rev
Author: sev
Date: 2009-12-27 14:27:36 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Fix compilation
Modified Paths:
--------------
tools/branches/gsoc2009-gui/Makefile.common
tools/branches/gsoc2009-gui/main_cli.cpp
tools/branches/gsoc2009-gui/scummvm-tools-cli.cpp
Modified: tools/branches/gsoc2009-gui/Makefile.common
===================================================================
--- tools/branches/gsoc2009-gui/Makefile.common 2009-12-27 14:25:25 UTC (rev 46647)
+++ tools/branches/gsoc2009-gui/Makefile.common 2009-12-27 14:27:36 UTC (rev 46648)
@@ -65,7 +65,7 @@
descumm$(EXEEXT) \
desword2$(EXEEXT) \
degob$(EXEEXT) \
- tools_cli$(EXEEXT)
+ scummvm-tools-cli$(EXEEXT)
ifdef USE_FREETYPE
TARGETS += \
@@ -74,7 +74,7 @@
ifdef USE_WXWIDGETS
TARGETS += \
- tools_gui$(EXEEXT)
+ scummvm-tools$(EXEEXT)
endif
UTILS := \
@@ -92,7 +92,7 @@
for i in $^ ; do install -p -m 0755 $$i $(DESTDIR) ; done
bundle_name = ScummVM\ Tools.app
-bundle: tools_gui$(EXEEXT)
+bundle: scummvm-tools$(EXEEXT)
mkdir -p $(bundle_name)
mkdir -p $(bundle_name)/Contents
mkdir -p $(bundle_name)/Contents/MacOS
@@ -100,7 +100,7 @@
echo "APPL????" > $(bundle_name)/Contents/PkgInfo
cp $(srcdir)/dist/macosx/Info.plist $(bundle_name)/Contents/
cp $(srcdir)/gui/media/*.* $(bundle_name)/Contents/Resources
- cp tools_gui$(EXEEXT) $(bundle_name)/Contents/MacOS/
+ cp scummvm-tools$(EXEEXT) $(bundle_name)/Contents/MacOS/
@@ -111,8 +111,8 @@
desword2 \
degob \
create_sjisfnt \
- tools_gui \
- tools_cli \
+ scummvm-tools \
+ scummvm-tools-cli \
sword2_clue
@@ -194,13 +194,13 @@
$(UTILS)
-tools_gui_OBJS := \
+scummvm-tools_OBJS := \
gui/main.o \
gui/configuration.o \
gui/pages.o \
gui/gui_tools.o \
$(tools_OBJS)
-tools_gui_LIBS := $(WXLIBS) $(LIBS)
+scummvm-tools_LIBS := $(WXLIBS) $(LIBS)
# Set custom build flags for various files
gui/configuration.o: CPPFLAGS+=$(WXINCLUDES)
@@ -210,11 +210,11 @@
-tools_cli_OBJS := \
+scummvm-tools-cli_OBJS := \
main_cli.o \
- tools_cli.o \
+ scummvm-tools-cli.o \
$(tools_OBJS)
-tools_cli_LIBS := $(LIBS)
+scummvm-tools-cli_LIBS := $(LIBS)
######################################################################
Modified: tools/branches/gsoc2009-gui/main_cli.cpp
===================================================================
--- tools/branches/gsoc2009-gui/main_cli.cpp 2009-12-27 14:25:25 UTC (rev 46647)
+++ tools/branches/gsoc2009-gui/main_cli.cpp 2009-12-27 14:27:36 UTC (rev 46648)
@@ -20,7 +20,7 @@
*
*/
-#include "tools_cli.h"
+#include "scummvm-tools-cli.h"
int main(int argc, char *argv[]) {
ToolsCLI cli;
Modified: tools/branches/gsoc2009-gui/scummvm-tools-cli.cpp
===================================================================
--- tools/branches/gsoc2009-gui/scummvm-tools-cli.cpp 2009-12-27 14:25:25 UTC (rev 46647)
+++ tools/branches/gsoc2009-gui/scummvm-tools-cli.cpp 2009-12-27 14:27:36 UTC (rev 46648)
@@ -24,7 +24,7 @@
#include <algorithm>
#include <cassert>
-#include "tools_cli.h"
+#include "scummvm-tools-cli.h"
ToolsCLI::ToolsCLI() {
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list