History

Fix line endings on Windows specific files

Erik de Castro Lopo committed 8 years ago

Commit b2f7a321 parent 83a94823 files · +200 −200Browse files

Unified · Split

3 files
  1. Make.bat +22 −22
  2. Win32/Makefile.msvc +150 −150
  3. Win32/libsamplerate-0.def +28 −28
Make.bat+22−22
@@ -1,22 +1,22 @@
1@echo off1@echo off
2 2
3if "%1"=="check" GOTO CHECK3if "%1"=="check" GOTO CHECK
4if "%1"=="clean" GOTO CLEAN4if "%1"=="clean" GOTO CLEAN
5 5
6copy /y Win32\config.h src\config.h6copy /y Win32\config.h src\config.h
7copy /y Win32\unistd.h examples\unistd.h7copy /y Win32\unistd.h examples\unistd.h
8 8
9nmake -f Win32\Makefile.msvc9nmake -f Win32\Makefile.msvc
10goto END10goto END
11 11
12 12
13:CHECK13:CHECK
14nmake -f Win32\Makefile.msvc check14nmake -f Win32\Makefile.msvc check
15goto END15goto END
16 16
17:CLEAN17:CLEAN
18nmake -f Win32\Makefile.msvc clean18nmake -f Win32\Makefile.msvc clean
19goto END19goto END
20 20
21:END21:END
22 22
Win32/Makefile.msvc+150−150
@@ -1,150 +1,150 @@
1 1
2# Set the value of $(MSVCDir) for your installation.2# Set the value of $(MSVCDir) for your installation.
3 3
4# MSVCDir="C:\Progra~1\Micros~1\VC98"4# MSVCDir="C:\Progra~1\Micros~1\VC98"
5# CFLAGS=/nologo /MD /W1 /GX /O2 /I "$(MSVCDir)\Include" /I . /I "Win32" /I "src" /D "WIN32" /D "_USRDLL" /YX /FD /Zm10005# CFLAGS=/nologo /MD /W1 /GX /O2 /I "$(MSVCDir)\Include" /I . /I "Win32" /I "src" /D "WIN32" /D "_USRDLL" /YX /FD /Zm1000
6# PROG_LINK_FLAGS=/nologo /incremental:no /libpath:"$(MSVCDir)\Lib" /pdb:"libsamplerate-0.pdb" /machine:I386 /exetype:dynamic6# PROG_LINK_FLAGS=/nologo /incremental:no /libpath:"$(MSVCDir)\Lib" /pdb:"libsamplerate-0.pdb" /machine:I386 /exetype:dynamic
7 7
8MSVCDir="C:\Progra~1\Micros~1.Net\Vc7"8MSVCDir="C:\Progra~1\Micros~1.Net\Vc7"
9CFLAGS=/nologo /MD /W1 /GX /O2 /Zm200 /I "$(MSVCDir)\Include" /I "$(MSVCDir)\PlatformSDK\Include" /I . /I "Win32" /I "src" /D "WIN32" /D "_USRDLL" /YX /FD /Zm10009CFLAGS=/nologo /MD /W1 /GX /O2 /Zm200 /I "$(MSVCDir)\Include" /I "$(MSVCDir)\PlatformSDK\Include" /I . /I "Win32" /I "src" /D "WIN32" /D "_USRDLL" /YX /FD /Zm1000
10PROG_LINK_FLAGS=/nologo /incremental:no /libpath:"$(MSVCDir)\Lib" /libpath:"$(MSVCDir)\PlatformSDK\Lib" /pdb:"libsamplerate-0.pdb" /machine:I386 /exetype:dynamic10PROG_LINK_FLAGS=/nologo /incremental:no /libpath:"$(MSVCDir)\Lib" /libpath:"$(MSVCDir)\PlatformSDK\Lib" /pdb:"libsamplerate-0.pdb" /machine:I386 /exetype:dynamic
11 11
12CPP=cl.exe12CPP=cl.exe
13LINK32=link.exe13LINK32=link.exe
14DLL_LINK_FLAGS=/nologo /dll /incremental:no /libpath:"$(MSVCDir)\Lib" /pdb:"libsamplerate-0.pdb" /implib:".\libsamplerate-0.lib" /machine:I386 /out:"libsamplerate-0.dll"14DLL_LINK_FLAGS=/nologo /dll /incremental:no /libpath:"$(MSVCDir)\Lib" /pdb:"libsamplerate-0.pdb" /implib:".\libsamplerate-0.lib" /machine:I386 /out:"libsamplerate-0.dll"
15 15
16#====================================================================16#====================================================================
17# Targets17# Targets
18 18
19ALL : libsndfile-1.lib libsamplerate-0.dll \19ALL : libsndfile-1.lib libsamplerate-0.dll \
20 ".\examples\sndfile-resample.exe" \20 ".\examples\sndfile-resample.exe" \
21 ".\examples\varispeed-play.exe"21 ".\examples\varispeed-play.exe"
22 22
23CLEAN :23CLEAN :
24 -@erase "src\*.obj"24 -@erase "src\*.obj"
25 -@erase "tests\*.exe"25 -@erase "tests\*.exe"
26 26
27#====================================================================27#====================================================================
28 28
29LINK32_OBJS= \29LINK32_OBJS= \
30 ".\src\samplerate.obj" \30 ".\src\samplerate.obj" \
31 ".\src\src_linear.obj" \31 ".\src\src_linear.obj" \
32 ".\src\src_zoh.obj" \32 ".\src\src_zoh.obj" \
33 ".\src\src_sinc.obj"33 ".\src\src_sinc.obj"
34 34
35libsamplerate-0.dll : $(LINK32_OBJS) ".\Win32\libsamplerate-0.def"35libsamplerate-0.dll : $(LINK32_OBJS) ".\Win32\libsamplerate-0.def"
36 $(LINK32) $(DLL_LINK_FLAGS) /def:".\Win32\libsamplerate-0.def" $(LINK32_OBJS)36 $(LINK32) $(DLL_LINK_FLAGS) /def:".\Win32\libsamplerate-0.def" $(LINK32_OBJS)
37 37
38".\examples\sndfile-resample.exe" : ".\examples\sndfile-resample.c"38".\examples\sndfile-resample.exe" : ".\examples\sndfile-resample.c"
39 $(CPP) $(CFLAGS) /Fo".\examples\sndfile-resample.obj" /c ".\examples\sndfile-resample.c"39 $(CPP) $(CFLAGS) /Fo".\examples\sndfile-resample.obj" /c ".\examples\sndfile-resample.c"
40 $(LINK32) $(PROG_LINK_FLAGS) /out:".\examples\sndfile-resample.exe" ".\examples\sndfile-resample.obj" libsamplerate-0.lib libsndfile-1.lib40 $(LINK32) $(PROG_LINK_FLAGS) /out:".\examples\sndfile-resample.exe" ".\examples\sndfile-resample.obj" libsamplerate-0.lib libsndfile-1.lib
41 41
42".\examples\varispeed-play.exe" : ".\examples\varispeed-play.c" ".\examples\audio_out.obj"42".\examples\varispeed-play.exe" : ".\examples\varispeed-play.c" ".\examples\audio_out.obj"
43 $(CPP) $(CFLAGS) /Fo".\examples\varispeed-play.obj" /c ".\examples\varispeed-play.c"43 $(CPP) $(CFLAGS) /Fo".\examples\varispeed-play.obj" /c ".\examples\varispeed-play.c"
44 $(LINK32) $(PROG_LINK_FLAGS) /out:".\examples\varispeed-play.exe" ".\examples\varispeed-play.obj" ".\examples\audio_out.obj" libsamplerate-0.lib libsndfile-1.lib winmm.lib44 $(LINK32) $(PROG_LINK_FLAGS) /out:".\examples\varispeed-play.exe" ".\examples\varispeed-play.obj" ".\examples\audio_out.obj" libsamplerate-0.lib libsndfile-1.lib winmm.lib
45 45
46".\examples\audio_out.obj" : ".\examples\audio_out.c"46".\examples\audio_out.obj" : ".\examples\audio_out.c"
47 $(CPP) $(CFLAGS) /Fo".\examples\audio_out.obj" /c ".\examples\audio_out.c"47 $(CPP) $(CFLAGS) /Fo".\examples\audio_out.obj" /c ".\examples\audio_out.c"
48 48
49TEST_PROGS= \49TEST_PROGS= \
50 ".\tests\misc_test.exe" \50 ".\tests\misc_test.exe" \
51 ".\tests\termination_test.exe" \51 ".\tests\termination_test.exe" \
52 ".\tests\simple_test.exe" \52 ".\tests\simple_test.exe" \
53 ".\tests\reset_test.exe" \53 ".\tests\reset_test.exe" \
54 ".\tests\multi_channel_test.exe" \54 ".\tests\multi_channel_test.exe" \
55 ".\tests\snr_bw_test.exe" \55 ".\tests\snr_bw_test.exe" \
56 ".\tests\throughput_test.exe"56 ".\tests\throughput_test.exe"
57 57
58CHECK: $(TEST_PROGS)58CHECK: $(TEST_PROGS)
59 ".\tests\misc_test.exe"59 ".\tests\misc_test.exe"
60 ".\tests\termination_test.exe"60 ".\tests\termination_test.exe"
61 ".\tests\simple_test.exe"61 ".\tests\simple_test.exe"
62 ".\tests\reset_test.exe"62 ".\tests\reset_test.exe"
63 ".\tests\multi_channel_test.exe"63 ".\tests\multi_channel_test.exe"
64 ".\tests\snr_bw_test.exe"64 ".\tests\snr_bw_test.exe"
65 ".\tests\throughput_test.exe"65 ".\tests\throughput_test.exe"
66 -@echo ----------------------------------------------------------------------66 -@echo ----------------------------------------------------------------------
67 -@echo libsamplerate passed all tests67 -@echo libsamplerate passed all tests
68 -@echo ----------------------------------------------------------------------68 -@echo ----------------------------------------------------------------------
69 69
70#====================================================================70#====================================================================
71# C files in src.71# C files in src.
72 72
73".\src\samplerate.obj" : ".\src\samplerate.c"73".\src\samplerate.obj" : ".\src\samplerate.c"
74 $(CPP) $(CFLAGS) /Fo".\src\samplerate.obj" /c ".\src\samplerate.c"74 $(CPP) $(CFLAGS) /Fo".\src\samplerate.obj" /c ".\src\samplerate.c"
75 75
76".\src\src_linear.obj" : ".\src\src_linear.c"76".\src\src_linear.obj" : ".\src\src_linear.c"
77 $(CPP) $(CFLAGS) /Fo".\src\src_linear.obj" /c ".\src\src_linear.c"77 $(CPP) $(CFLAGS) /Fo".\src\src_linear.obj" /c ".\src\src_linear.c"
78 78
79".\src\src_zoh.obj" : ".\src\src_zoh.c"79".\src\src_zoh.obj" : ".\src\src_zoh.c"
80 $(CPP) $(CFLAGS) /Fo".\src\src_zoh.obj" /c ".\src\src_zoh.c"80 $(CPP) $(CFLAGS) /Fo".\src\src_zoh.obj" /c ".\src\src_zoh.c"
81 81
82".\src\src_sinc.obj" : ".\src\src_sinc.c"82".\src\src_sinc.obj" : ".\src\src_sinc.c"
83 $(CPP) $(CFLAGS) /Fo".\src\src_sinc.obj" /c ".\src\src_sinc.c"83 $(CPP) $(CFLAGS) /Fo".\src\src_sinc.obj" /c ".\src\src_sinc.c"
84 84
85#====================================================================85#====================================================================
86# Object files for test programs.86# Object files for test programs.
87 87
88".\tests\util.obj" : ".\tests\util.c"88".\tests\util.obj" : ".\tests\util.c"
89 $(CPP) $(CFLAGS) /Fo".\tests\util.obj" /c ".\tests\util.c"89 $(CPP) $(CFLAGS) /Fo".\tests\util.obj" /c ".\tests\util.c"
90 90
91".\tests\calc_snr.obj" : ".\tests\calc_snr.c"91".\tests\calc_snr.obj" : ".\tests\calc_snr.c"
92 $(CPP) $(CFLAGS) /Fo".\tests\calc_snr.obj" /c ".\tests\calc_snr.c"92 $(CPP) $(CFLAGS) /Fo".\tests\calc_snr.obj" /c ".\tests\calc_snr.c"
93 93
94".\tests\dft_cmp.obj" : ".\tests\dft_cmp.c"94".\tests\dft_cmp.obj" : ".\tests\dft_cmp.c"
95 $(CPP) $(CFLAGS) /Fo".\tests\dft_cmp.obj" /c ".\tests\dft_cmp.c"95 $(CPP) $(CFLAGS) /Fo".\tests\dft_cmp.obj" /c ".\tests\dft_cmp.c"
96 96
97#====================================================================97#====================================================================
98# Test programs.98# Test programs.
99 99
100".\tests\misc_test.exe" : ".\tests\misc_test.c" ".\tests\util.obj"100".\tests\misc_test.exe" : ".\tests\misc_test.c" ".\tests\util.obj"
101 $(CPP) $(CFLAGS) /Fo".\tests\misc_test.obj" /c ".\tests\misc_test.c"101 $(CPP) $(CFLAGS) /Fo".\tests\misc_test.obj" /c ".\tests\misc_test.c"
102 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\misc_test.exe" ".\tests\misc_test.obj" ".\tests\util.obj" libsamplerate-0.lib102 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\misc_test.exe" ".\tests\misc_test.obj" ".\tests\util.obj" libsamplerate-0.lib
103 103
104".\tests\termination_test.exe" : ".\tests\termination_test.c" ".\tests\util.obj"104".\tests\termination_test.exe" : ".\tests\termination_test.c" ".\tests\util.obj"
105 $(CPP) $(CFLAGS) /Fo".\tests\termination_test.obj" /c ".\tests\termination_test.c"105 $(CPP) $(CFLAGS) /Fo".\tests\termination_test.obj" /c ".\tests\termination_test.c"
106 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\termination_test.exe" ".\tests\termination_test.obj" ".\tests\util.obj" libsamplerate-0.lib106 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\termination_test.exe" ".\tests\termination_test.obj" ".\tests\util.obj" libsamplerate-0.lib
107 107
108".\tests\streaming_test.exe" : ".\tests\streaming_test.c" ".\tests\util.obj"108".\tests\streaming_test.exe" : ".\tests\streaming_test.c" ".\tests\util.obj"
109 $(CPP) $(CFLAGS) /Fo".\tests\streaming_test.obj" /c ".\tests\streaming_test.c"109 $(CPP) $(CFLAGS) /Fo".\tests\streaming_test.obj" /c ".\tests\streaming_test.c"
110 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\streaming_test.exe" ".\tests\streaming_test.obj" ".\tests\util.obj" libsamplerate-0.lib110 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\streaming_test.exe" ".\tests\streaming_test.obj" ".\tests\util.obj" libsamplerate-0.lib
111 111
112".\tests\simple_test.exe" : ".\tests\simple_test.c" ".\tests\util.obj"112".\tests\simple_test.exe" : ".\tests\simple_test.c" ".\tests\util.obj"
113 $(CPP) $(CFLAGS) /Fo".\tests\simple_test.obj" /c ".\tests\simple_test.c"113 $(CPP) $(CFLAGS) /Fo".\tests\simple_test.obj" /c ".\tests\simple_test.c"
114 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\simple_test.exe" ".\tests\simple_test.obj" ".\tests\util.obj" libsamplerate-0.lib114 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\simple_test.exe" ".\tests\simple_test.obj" ".\tests\util.obj" libsamplerate-0.lib
115 115
116".\tests\reset_test.exe" : ".\tests\reset_test.c" ".\tests\util.obj"116".\tests\reset_test.exe" : ".\tests\reset_test.c" ".\tests\util.obj"
117 $(CPP) $(CFLAGS) /Fo".\tests\reset_test.obj" /c ".\tests\reset_test.c"117 $(CPP) $(CFLAGS) /Fo".\tests\reset_test.obj" /c ".\tests\reset_test.c"
118 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\reset_test.exe" ".\tests\reset_test.obj" ".\tests\util.obj" libsamplerate-0.lib118 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\reset_test.exe" ".\tests\reset_test.obj" ".\tests\util.obj" libsamplerate-0.lib
119 119
120".\tests\multi_channel_test.exe" : ".\tests\multi_channel_test.c" ".\tests\util.obj" ".\tests\calc_snr.obj"120".\tests\multi_channel_test.exe" : ".\tests\multi_channel_test.c" ".\tests\util.obj" ".\tests\calc_snr.obj"
121 $(CPP) $(CFLAGS) /Fo".\tests\multi_channel_test.obj" /c ".\tests\multi_channel_test.c"121 $(CPP) $(CFLAGS) /Fo".\tests\multi_channel_test.obj" /c ".\tests\multi_channel_test.c"
122 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\multi_channel_test.exe" ".\tests\multi_channel_test.obj" ".\tests\util.obj" ".\tests\calc_snr.obj" libsamplerate-0.lib122 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\multi_channel_test.exe" ".\tests\multi_channel_test.obj" ".\tests\util.obj" ".\tests\calc_snr.obj" libsamplerate-0.lib
123 123
124".\tests\snr_bw_test.exe" : ".\tests\snr_bw_test.c" ".\tests\util.obj"124".\tests\snr_bw_test.exe" : ".\tests\snr_bw_test.c" ".\tests\util.obj"
125 $(CPP) $(CFLAGS) /Fo".\tests\snr_bw_test.obj" /c ".\tests\snr_bw_test.c"125 $(CPP) $(CFLAGS) /Fo".\tests\snr_bw_test.obj" /c ".\tests\snr_bw_test.c"
126 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\snr_bw_test.exe" ".\tests\snr_bw_test.obj" ".\tests\util.obj" libsamplerate-0.lib126 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\snr_bw_test.exe" ".\tests\snr_bw_test.obj" ".\tests\util.obj" libsamplerate-0.lib
127 127
128".\tests\throughput_test.exe" : ".\tests\throughput_test.c" ".\tests\util.obj"128".\tests\throughput_test.exe" : ".\tests\throughput_test.c" ".\tests\util.obj"
129 $(CPP) $(CFLAGS) /Fo".\tests\throughput_test.obj" /c ".\tests\throughput_test.c"129 $(CPP) $(CFLAGS) /Fo".\tests\throughput_test.obj" /c ".\tests\throughput_test.c"
130 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\throughput_test.exe" ".\tests\throughput_test.obj" ".\tests\util.obj" libsamplerate-0.lib130 $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\throughput_test.exe" ".\tests\throughput_test.obj" ".\tests\util.obj" libsamplerate-0.lib
131 131
132#====================================================================132#====================================================================
133# Bit of extra trickery.133# Bit of extra trickery.
134 134
135sndfile.h libsndfile-1.dll libsndfile-1.def :135sndfile.h libsndfile-1.dll libsndfile-1.def :
136 -@echo *---------------------------------------------------------------136 -@echo *---------------------------------------------------------------
137 -@echo * You need to get the pre-built Win32 binaries for libsndfile137 -@echo * You need to get the pre-built Win32 binaries for libsndfile
138 -@echo * from : http://www.mega-nerd.com/libsndfile138 -@echo * from : http://www.mega-nerd.com/libsndfile
139 -@echo * The prebuilt binaries will be in a ZIP file which contains139 -@echo * The prebuilt binaries will be in a ZIP file which contains
140 -@echo * the files :140 -@echo * the files :
141 -@echo * sndfile.h libsndfile-1.dll libsndfile-1.def141 -@echo * sndfile.h libsndfile-1.dll libsndfile-1.def
142 -@echo * which need to be copied to this directory.142 -@echo * which need to be copied to this directory.
143 -@echo *---------------------------------------------------------------143 -@echo *---------------------------------------------------------------
144 -@exit 1144 -@exit 1
145 145
146libsndfile-1.lib : libsndfile-1.dll libsndfile-1.def146libsndfile-1.lib : libsndfile-1.dll libsndfile-1.def
147 lib /machine:i386 /def:libsndfile-1.def147 lib /machine:i386 /def:libsndfile-1.def
148 148
149# End of Makefile149# End of Makefile
150#====================================================================150#====================================================================
Win32/libsamplerate-0.def+28−28
@@ -1,28 +1,28 @@
1LIBRARY libsamplerate-0.dll1LIBRARY libsamplerate-0.dll
2EXPORTS2EXPORTS
3 3
4src_new @14src_new @1
5src_delete @25src_delete @2
6 6
7src_get_name @107src_get_name @10
8src_get_description @118src_get_description @11
9src_get_version @129src_get_version @12
10 10
11src_process @2011src_process @20
12src_reset @2112src_reset @21
13src_set_ratio @2213src_set_ratio @22
14 14
15src_error @3015src_error @30
16src_strerror @3116src_strerror @31
17 17
18src_simple @4018src_simple @40
19 19
20src_is_valid_ratio @5020src_is_valid_ratio @50
21 21
22src_callback_new @6022src_callback_new @60
23src_callback_read @6123src_callback_read @61
24 24
25src_short_to_float_array @7025src_short_to_float_array @70
26src_float_to_short_array @7126src_float_to_short_array @71
27src_int_to_float_array @8027src_int_to_float_array @80
28src_float_to_int_array @8128src_float_to_int_array @81

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t