summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-11-24 09:34:30 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-11-24 09:34:30 +0100
commit9018b65a681d41866b1e12ffb687e427c8ca76b1 (patch)
tree19807fc92dff2eeccb3228c13561a3559be9abf5
parentb4b6187aaa21e702bac7c9562b449c5de50e5460 (diff)
downloadmana-client-9018b65a681d41866b1e12ffb687e427c8ca76b1.tar.gz
mana-client-9018b65a681d41866b1e12ffb687e427c8ca76b1.tar.bz2
mana-client-9018b65a681d41866b1e12ffb687e427c8ca76b1.tar.xz
mana-client-9018b65a681d41866b1e12ffb687e427c8ca76b1.zip
Converted some DOS newlines to UNIX
-rw-r--r--src/tmw.rc46
-rw-r--r--src/winver.h12
-rw-r--r--tools/tmxcopy/Makefile36
3 files changed, 47 insertions, 47 deletions
diff --git a/src/tmw.rc b/src/tmw.rc
index 673b2387..9661ac6b 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -1,23 +1,23 @@
-#include <windows.h> // include for version info constants
-
-#include "winver.h"
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"
-
-1 VERSIONINFO
-FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-FILETYPE VFT_APP {
- BLOCK "StringFileInfo" {
- BLOCK "040904E4" {
- VALUE "CompanyName", "The Mana World Development Team"
- VALUE "FileVersion", PACKAGE_VERSION
- VALUE "FileDescription", "The Mana World"
- VALUE "LegalCopyright", "2004-2006 (C)"
- VALUE "OriginalFilename", "tmw.exe"
- VALUE "ProductName", "The Mana World MMORPG"
- VALUE "ProductVersion", PACKAGE_VERSION
- }
- }
-}
-
+#include <windows.h> // include for version info constants
+
+#include "winver.h"
+
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"
+
+1 VERSIONINFO
+FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+FILETYPE VFT_APP {
+ BLOCK "StringFileInfo" {
+ BLOCK "040904E4" {
+ VALUE "CompanyName", "The Mana World Development Team"
+ VALUE "FileVersion", PACKAGE_VERSION
+ VALUE "FileDescription", "The Mana World"
+ VALUE "LegalCopyright", "2004-2006 (C)"
+ VALUE "OriginalFilename", "tmw.exe"
+ VALUE "ProductName", "The Mana World MMORPG"
+ VALUE "ProductVersion", PACKAGE_VERSION
+ }
+ }
+}
+
diff --git a/src/winver.h b/src/winver.h
index 4de9bbe5..4452784e 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -1,6 +1,6 @@
-/* VERSION DEFINITIONS */
-#define VER_MAJOR 0
-#define VER_MINOR 0
-#define VER_RELEASE 26
-#define VER_BUILD 0
-#define PACKAGE_VERSION "0.0.26"
+/* VERSION DEFINITIONS */
+#define VER_MAJOR 0
+#define VER_MINOR 0
+#define VER_RELEASE 26
+#define VER_BUILD 0
+#define PACKAGE_VERSION "0.0.26"
diff --git a/tools/tmxcopy/Makefile b/tools/tmxcopy/Makefile
index 732dec36..84aa9fc6 100644
--- a/tools/tmxcopy/Makefile
+++ b/tools/tmxcopy/Makefile
@@ -1,18 +1,18 @@
-CC=g++
-CFLAGS=-c `pkg-config --cflags libxml-2.0`
-LDFLAGS=`pkg-config --libs libxml-2.0`
-SOURCES=base64.cpp main.cpp map.cpp xmlutils.cpp zlibutils.cpp
-OBJECTS=$(SOURCES:.cpp=.o)
-EXECUTABLE=tmxcopy
-
-all: $(SOURCES) $(EXECUTABLE)
- make clean
-
-$(EXECUTABLE): $(OBJECTS)
- $(CC) $(LDFLAGS) $(OBJECTS) -o $@
-
-.cpp.o:
- $(CC) $(CFLAGS) $< -o $@
-
-clean:
- rm -f *.o
+CC=g++
+CFLAGS=-c `pkg-config --cflags libxml-2.0`
+LDFLAGS=`pkg-config --libs libxml-2.0`
+SOURCES=base64.cpp main.cpp map.cpp xmlutils.cpp zlibutils.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+EXECUTABLE=tmxcopy
+
+all: $(SOURCES) $(EXECUTABLE)
+ make clean
+
+$(EXECUTABLE): $(OBJECTS)
+ $(CC) $(LDFLAGS) $(OBJECTS) -o $@
+
+.cpp.o:
+ $(CC) $(CFLAGS) $< -o $@
+
+clean:
+ rm -f *.o