Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.

1 files changed, 43 insertions, 43 deletions

diff --git a/libraries/irrlicht-1.8/examples/Demo/Makefile b/libraries/irrlicht-1.8/examples/Demo/Makefile
index 1577ac9..5a45876 100644
--- a/libraries/irrlicht-1.8/examples/Demo/Makefile
+++ b/libraries/irrlicht-1.8/examples/Demo/Makefile
@@ -1,43 +1,43 @@
-# Irrlicht Engine Demo Makefile

-Target = Demo

-Sources = CDemo.cpp CMainMenu.cpp main.cpp

-

-CPPFLAGS = -I../../include -I/usr/X11R6/include

-CXXFLAGS = -Wall -O3 -ffast-math

-

-ifeq ($(HOSTTYPE), x86_64)

-LIBSELECT=64

-endif

-

-all: all_linux

-

-# target specific settings

-all_linux: SYSTEM=Linux

-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

-

-all_win32 clean_win32: SYSTEM=Win32-gcc

-all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm

-

-# if you enable sound add the proper library for linking

-#LDFLAGS += -lIrrKlang

-#LDFLAGS += -laudiere

-#LDFLAGS += -lSDL_mixer -lSDL

-

-all_win32 clean_win32: SUF=.exe

-# name of the binary - only valid for targets which set SYSTEM

-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

-

-OBJ = $(Sources:.cpp=.o)

-

-all_linux all_win32: $(OBJ)

-        $(warning Building...)

-        $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $(DESTPATH) $(LDFLAGS)

-

-clean: clean_linux clean_win32

-        $(warning Cleaning...)

-        @$(RM) $(OBJ)

-

-clean_linux clean_win32:

-        @$(RM) $(DESTPATH)

-

-.PHONY: all all_win32 clean clean_linux clean_win32

+# Irrlicht Engine Demo Makefile
+Target = Demo
+Sources = CDemo.cpp CMainMenu.cpp main.cpp
+
+CPPFLAGS = -I../../include -I/usr/X11R6/include
+CXXFLAGS = -Wall -O3 -ffast-math
+
+ifeq ($(HOSTTYPE), x86_64)
+LIBSELECT=64
+endif
+
+all: all_linux
+
+# target specific settings
+all_linux: SYSTEM=Linux
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
+
+all_win32 clean_win32: SYSTEM=Win32-gcc
+all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
+
+# if you enable sound add the proper library for linking
+#LDFLAGS += -lIrrKlang
+#LDFLAGS += -laudiere
+#LDFLAGS += -lSDL_mixer -lSDL
+
+all_win32 clean_win32: SUF=.exe
+# name of the binary - only valid for targets which set SYSTEM
+DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
+
+OBJ = $(Sources:.cpp=.o)
+
+all_linux all_win32: $(OBJ)
+        $(warning Building...)
+        $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $(DESTPATH) $(LDFLAGS)
+
+clean: clean_linux clean_win32
+        $(warning Cleaning...)
+        @$(RM) $(OBJ)
+
+clean_linux clean_win32:
+        @$(RM) $(DESTPATH)
+
+.PHONY: all all_win32 clean clean_linux clean_win32