summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2019-02-14 21:20:10 +0100
committerStanislaw Halik <sthalik@misaki.pl>2019-02-14 21:20:10 +0100
commit3ef9b6c39949ac6d62134cf7fbd2e9f720ce3bc3 (patch)
tree8bab77ccf24d5bc21ea2b7860dc922d9fd406c28
parentd662f14aaf9382551ad43e862f2f3ee59ab823c7 (diff)
normalize line endings
-rw-r--r--bin/build-msvc.cmd52
-rw-r--r--proto-simconnect/manifest-template.in16
-rw-r--r--tracker-rs/rs_impl/attic/build.bat58
-rw-r--r--tracker-rs/rs_impl/attic/build_common.bat42
4 files changed, 84 insertions, 84 deletions
diff --git a/bin/build-msvc.cmd b/bin/build-msvc.cmd
index 4adad019..4c3d90b4 100644
--- a/bin/build-msvc.cmd
+++ b/bin/build-msvc.cmd
@@ -1,26 +1,26 @@
-@setlocal ENABLEDELAYEDEXPANSION
-@echo off
-
-call msvc
-
-taskkill -f -im trackir.exe 2>%SystemDrive%\NUL
-
-call:check cmake .
-call:check ninja i18n
-call:check "d:/cygwin64/bin/dash.exe" -c "git checkout -f -- ../*/lang/ ../*/*/lang/"
-call:check ninja -j6 install
-call:check "d:/cygwin64/bin/dash.exe" -c "git checkout -f -- ../*/lang/ ../*/*/lang/"
-
-exit /b 0
-
-:check
-
-cmd /c "msvc d:/cygwin64/bin/nice.exe -n 20 -- %*"
-
-if %ERRORLEVEL% EQU 0 (
- GOTO:EOF
-)
-
-rem echo error %ERRORLEVEL%
-exit %ERRORLEVEL%
-
+@setlocal ENABLEDELAYEDEXPANSION
+@echo off
+
+call msvc
+
+taskkill -f -im trackir.exe 2>%SystemDrive%\NUL
+
+call:check cmake .
+call:check ninja i18n
+call:check "d:/cygwin64/bin/dash.exe" -c "git checkout -f -- ../*/lang/ ../*/*/lang/"
+call:check ninja -j6 install
+call:check "d:/cygwin64/bin/dash.exe" -c "git checkout -f -- ../*/lang/ ../*/*/lang/"
+
+exit /b 0
+
+:check
+
+cmd /c "msvc d:/cygwin64/bin/nice.exe -n 20 -- %*"
+
+if %ERRORLEVEL% EQU 0 (
+ GOTO:EOF
+)
+
+rem echo error %ERRORLEVEL%
+exit %ERRORLEVEL%
+
diff --git a/proto-simconnect/manifest-template.in b/proto-simconnect/manifest-template.in
index fdf2c74a..69966102 100644
--- a/proto-simconnect/manifest-template.in
+++ b/proto-simconnect/manifest-template.in
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity type='win32' name='Microsoft.FlightSimulator.SimConnect' version='VERSION' processorArchitecture='x86' publicKeyToken='67c7c14424d61b5b' />
- </dependentAssembly>
- </dependency>
-</assembly>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type='win32' name='Microsoft.FlightSimulator.SimConnect' version='VERSION' processorArchitecture='x86' publicKeyToken='67c7c14424d61b5b' />
+ </dependentAssembly>
+ </dependency>
+</assembly>
diff --git a/tracker-rs/rs_impl/attic/build.bat b/tracker-rs/rs_impl/attic/build.bat
index 3d5e8bc0..9fa3f859 100644
--- a/tracker-rs/rs_impl/attic/build.bat
+++ b/tracker-rs/rs_impl/attic/build.bat
@@ -1,29 +1,29 @@
-@echo off
-
-setlocal
-
-IF DEFINED VS150COMNTOOLS (
- if exist "%VS150COMNTOOLS%\..\..\VC\vcvarsall.bat" (
- set vs_dir="%VS150COMNTOOLS%\..\..\VC"
- set vs_64=amd64
- ) else (
- rem it installed vcvarsall.bat here for me for some reason -sh 20160827
- set vs_dir="%VS150COMNTOOLS%\..\ide\vc"
- set vs_64=amd64
- )) else (
- set vs_dir="%VS140COMNTOOLS%\..\..\VC"
- set vs_64=amd64
- )
-
-cd /d "%~dp0"
-if %errorlevel% neq 0 exit /b 1
-
-set rs_objs=ftnoir_tracker_rs_impl.obj libpxc.obj
-
-set rs_subdir=ia32&set vs_var=x86
-call ".\build_common.bat" || exit /b 1
-
-set rs_subdir=amd64&set vs_var=%vs_64%
-call ".\build_common.bat" || exit /b 1
-
-exit /b 0
+@echo off
+
+setlocal
+
+IF DEFINED VS150COMNTOOLS (
+ if exist "%VS150COMNTOOLS%\..\..\VC\vcvarsall.bat" (
+ set vs_dir="%VS150COMNTOOLS%\..\..\VC"
+ set vs_64=amd64
+ ) else (
+ rem it installed vcvarsall.bat here for me for some reason -sh 20160827
+ set vs_dir="%VS150COMNTOOLS%\..\ide\vc"
+ set vs_64=amd64
+ )) else (
+ set vs_dir="%VS140COMNTOOLS%\..\..\VC"
+ set vs_64=amd64
+ )
+
+cd /d "%~dp0"
+if %errorlevel% neq 0 exit /b 1
+
+set rs_objs=ftnoir_tracker_rs_impl.obj libpxc.obj
+
+set rs_subdir=ia32&set vs_var=x86
+call ".\build_common.bat" || exit /b 1
+
+set rs_subdir=amd64&set vs_var=%vs_64%
+call ".\build_common.bat" || exit /b 1
+
+exit /b 0
diff --git a/tracker-rs/rs_impl/attic/build_common.bat b/tracker-rs/rs_impl/attic/build_common.bat
index c37e0ae8..87453cba 100644
--- a/tracker-rs/rs_impl/attic/build_common.bat
+++ b/tracker-rs/rs_impl/attic/build_common.bat
@@ -1,21 +1,21 @@
-@echo off
-
-setlocal
-
-cd /d .\bin\%rs_subdir% || exit 1
-
-echo --- %rs_subdir%
-
-set rice_ld=/OPT:REF /OPT:ICF=10 /DEBUG /DYNAMICBASE /NXCOMPAT /LTCG
-set rice_lib=
-set rice_cc=/Ox /arch:SSE2 /EHscr /fp:fast /GS- /GF /GR- /Gy /MT /Y- /Zi /W1 /GL /Zi
-set libs=advapi32.lib
-
-if not exist %vs_dir%\vcvarsall.bat exit /b 1
-call %vs_dir%\vcvarsall %vs_var% || exit /b 1
-if ["%libpath%"] == [""] exit /b 1
-
-cl /c /nologo -DEXPORT_RS_IMPL -DUNICODE -D_UNICODE -MT %rice_cc% /I "%RSSDK_DIR%\opensource\include" ..\..\ftnoir_tracker_rs_impl.cpp "%RSSDK_DIR%\opensource\src\libpxc\libpxc.cpp" || exit /b 1
-lib /nologo %rice_lib% %rs_objs% %libs% /OUT:rs-impl.lib || exit /b 1
-
-exit /b 0
+@echo off
+
+setlocal
+
+cd /d .\bin\%rs_subdir% || exit 1
+
+echo --- %rs_subdir%
+
+set rice_ld=/OPT:REF /OPT:ICF=10 /DEBUG /DYNAMICBASE /NXCOMPAT /LTCG
+set rice_lib=
+set rice_cc=/Ox /arch:SSE2 /EHscr /fp:fast /GS- /GF /GR- /Gy /MT /Y- /Zi /W1 /GL /Zi
+set libs=advapi32.lib
+
+if not exist %vs_dir%\vcvarsall.bat exit /b 1
+call %vs_dir%\vcvarsall %vs_var% || exit /b 1
+if ["%libpath%"] == [""] exit /b 1
+
+cl /c /nologo -DEXPORT_RS_IMPL -DUNICODE -D_UNICODE -MT %rice_cc% /I "%RSSDK_DIR%\opensource\include" ..\..\ftnoir_tracker_rs_impl.cpp "%RSSDK_DIR%\opensource\src\libpxc\libpxc.cpp" || exit /b 1
+lib /nologo %rice_lib% %rs_objs% %libs% /OUT:rs-impl.lib || exit /b 1
+
+exit /b 0