Fix line endings

12 years ago · 8a8aba3688
parent c02180a47e
commit 8a8aba3688
2 changed files with 99 additions and 99 deletions
--- a/src/native/windows/run/Makefile
+++ b/src/native/windows/run/Makefile
@ -1,53 +1,53 @@
-#
-# Jitsi, the OpenSource Java VoIP and Instant Messaging client.
-#
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
-#
-
-MINGW_HOME ?= C:/mingw
-PRODUCTNAME ?= Jitsi
-COMPANYNAME ?= jitsi.org
-PRODUCTBUILDVERSION ?= 1.0.0.0
-TARGET_BASENAME ?= run
-TARGET_DIR ?= ../../../../release/windows/tmp
-
-ifeq ($(wildcard /bin/cygpath.*),/bin/cygpath.exe)
-    target.dir := $(shell cygpath --mixed "$(TARGET_DIR)")
-    cygwin.target.dir := $(shell cygpath --unix "$(TARGET_DIR)")
-else
-    target.dir := "$(TARGET_DIR)"
-    cygwin.target.dir := "$(TARGET_DIR)"
-endif
-
-CC = $(MINGW_HOME)/bin/gcc.exe
-CPPFLAGS := $(CPPFLAGS) \
-	-O2 \
-	-Wall -Wreturn-type \
-	-DPSAPI_VERSION=1 \
-	-DWINVER=0x0502 -D_WIN32_WINNT=0x0502 \
-	-I$(target.dir) \
-	-I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32"
-LDFLAGS = -mwindows
-LIBS = -ladvapi32 -lpsapi
-
-MACHINE = $(shell $(CC) -dumpmachine)
-WINDRES = $(MINGW_HOME)/bin/windres.exe
-ifneq ("x$(MACHINE)","x")
-ifeq ($(wildcard $(MINGW_HOME)/bin/$(MACHINE)-windres.*),$(MINGW_HOME)/bin/$(MACHINE)-windres.exe)
-    WINDRES = $(MINGW_HOME)/bin/$(MACHINE)-windres.exe
-endif
-endif
-
-$(cygwin.target.dir)/$(TARGET_BASENAME).exe: $(cygwin.target.dir)/config.h registry.c run.c $(cygwin.target.dir)/run.res ../setup/nls.c
-	$(CC) $(CPPFLAGS) registry.c run.c $(target.dir)/run.res ../setup/nls.c $(LDFLAGS) -o $(target.dir)/$(TARGET_BASENAME).exe $(LIBS)
-	-$(MINGW_HOME)/$(MACHINE)/bin/strip.exe $(target.dir)/$(TARGET_BASENAME).exe
-
-.PHONY: $(cygwin.target.dir)/config.h
-
-$(cygwin.target.dir)/config.h:
-	-rm.exe -f ../../../../resources/install/windows/config.h
-	echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#define COMPANYNAME "$(COMPANYNAME)"\n#define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)"\n#define TARGET_BASENAME "$(TARGET_BASENAME)"\n#define TARGET_BASENAME_EXE "$(TARGET_BASENAME).exe"' > $(cygwin.target.dir)/config.h
-
-$(cygwin.target.dir)/run.res: $(cygwin.target.dir)/config.h run.rc
-	$(WINDRES) -I../../../../resources/install/windows -I$(target.dir) run.rc -O coff -o $(target.dir)/run.res
+#
+# Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+#
+# Distributable under LGPL license.
+# See terms of license at gnu.org.
+#
+
+MINGW_HOME ?= C:/mingw
+PRODUCTNAME ?= Jitsi
+COMPANYNAME ?= jitsi.org
+PRODUCTBUILDVERSION ?= 1.0.0.0
+TARGET_BASENAME ?= run
+TARGET_DIR ?= ../../../../release/windows/tmp
+
+ifeq ($(wildcard /bin/cygpath.*),/bin/cygpath.exe)
+    target.dir := $(shell cygpath --mixed "$(TARGET_DIR)")
+    cygwin.target.dir := $(shell cygpath --unix "$(TARGET_DIR)")
+else
+    target.dir := "$(TARGET_DIR)"
+    cygwin.target.dir := "$(TARGET_DIR)"
+endif
+
+CC = $(MINGW_HOME)/bin/gcc.exe
+CPPFLAGS := $(CPPFLAGS) \
+	-O2 \
+	-Wall -Wreturn-type \
+	-DPSAPI_VERSION=1 \
+	-DWINVER=0x0502 -D_WIN32_WINNT=0x0502 \
+	-I$(target.dir) \
+	-I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32"
+LDFLAGS = -mwindows
+LIBS = -ladvapi32 -lpsapi
+
+MACHINE = $(shell $(CC) -dumpmachine)
+WINDRES = $(MINGW_HOME)/bin/windres.exe
+ifneq ("x$(MACHINE)","x")
+ifeq ($(wildcard $(MINGW_HOME)/bin/$(MACHINE)-windres.*),$(MINGW_HOME)/bin/$(MACHINE)-windres.exe)
+    WINDRES = $(MINGW_HOME)/bin/$(MACHINE)-windres.exe
+endif
+endif
+
+$(cygwin.target.dir)/$(TARGET_BASENAME).exe: $(cygwin.target.dir)/config.h registry.c run.c $(cygwin.target.dir)/run.res ../setup/nls.c
+	$(CC) $(CPPFLAGS) registry.c run.c $(target.dir)/run.res ../setup/nls.c $(LDFLAGS) -o $(target.dir)/$(TARGET_BASENAME).exe $(LIBS)
+	-$(MINGW_HOME)/$(MACHINE)/bin/strip.exe $(target.dir)/$(TARGET_BASENAME).exe
+
+.PHONY: $(cygwin.target.dir)/config.h
+
+$(cygwin.target.dir)/config.h:
+	-rm.exe -f ../../../../resources/install/windows/config.h
+	echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#define COMPANYNAME "$(COMPANYNAME)"\n#define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)"\n#define TARGET_BASENAME "$(TARGET_BASENAME)"\n#define TARGET_BASENAME_EXE "$(TARGET_BASENAME).exe"' > $(cygwin.target.dir)/config.h
+
+$(cygwin.target.dir)/run.res: $(cygwin.target.dir)/config.h run.rc
+	$(WINDRES) -I../../../../resources/install/windows -I$(target.dir) run.rc -O coff -o $(target.dir)/run.res
--- a/src/native/windows/run/run.rc
+++ b/src/native/windows/run/run.rc
@ -1,46 +1,46 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include "run.h"
-
-#ifndef RT_MANIFEST
-#define RT_MANIFEST 24
-#endif /* #ifndef RT_MANIFEST */
-1 RT_MANIFEST "asInvoker.exe.manifest"
-
-SCLogoIcon ICON sc-logo.ico
-
-STRINGTABLE
-BEGIN
-    IDS_CRASHANDRELAUNCH "Ouch, it seems %1 has crashed!\012\012Relaunch it?"
-    IDS_JAVANOTFOUND "A Java Runtime Environment (JRE) or Java Development Kit (JDK) must be available in order to run %1."
-END
-
-1 VERSIONINFO
-    FILEVERSION 0,0,0,0
-    FILETYPE VFT_APP
-    PRODUCTVERSION 0,0,0,0
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", ""
-            VALUE "CompanyName", COMPANYNAME
-            VALUE "FileDescription", PRODUCTNAME
-            VALUE "FileVersion", PRODUCTBUILDVERSION
-            VALUE "InternalName", TARGET_BASENAME
-            VALUE "OriginalFilename", TARGET_BASENAME_EXE
-            VALUE "ProductName", PRODUCTNAME
-            VALUE "ProductVersion", PRODUCTBUILDVERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 1252
-    END
-END
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+#include "run.h"
+
+#ifndef RT_MANIFEST
+#define RT_MANIFEST 24
+#endif /* #ifndef RT_MANIFEST */
+1 RT_MANIFEST "asInvoker.exe.manifest"
+
+SCLogoIcon ICON sc-logo.ico
+
+STRINGTABLE
+BEGIN
+    IDS_CRASHANDRELAUNCH "Ouch, it seems %1 has crashed!\012\012Relaunch it?"
+    IDS_JAVANOTFOUND "A Java Runtime Environment (JRE) or Java Development Kit (JDK) must be available in order to run %1."
+END
+
+1 VERSIONINFO
+    FILEVERSION 0,0,0,0
+    FILETYPE VFT_APP
+    PRODUCTVERSION 0,0,0,0
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", ""
+            VALUE "CompanyName", COMPANYNAME
+            VALUE "FileDescription", PRODUCTNAME
+            VALUE "FileVersion", PRODUCTBUILDVERSION
+            VALUE "InternalName", TARGET_BASENAME
+            VALUE "OriginalFilename", TARGET_BASENAME_EXE
+            VALUE "ProductName", PRODUCTNAME
+            VALUE "ProductVersion", PRODUCTBUILDVERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0409, 1252
+    END
+END