stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 05:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Alam Ed Arias 2017-12-27 19:34:28 -05:00
commit 1ab5273400
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -18,3 +18,4 @@ Win32_LIB_ASM_Release
*.user *.user
*.db *.db
*.opendb *.opendb
/.vs

4
src/hardware/r_opengl/r_opengl-vc10.vcxproj
View file

@ -122,6 +122,7 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<ImportLibrary>$(IntDir)r_opengl.lib</ImportLibrary> <ImportLibrary>$(IntDir)r_opengl.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@ -166,6 +167,7 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<ImportLibrary>$(IntDir)r_opengl.lib</ImportLibrary> <ImportLibrary>$(IntDir)r_opengl.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@ -212,6 +214,7 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<ImportLibrary>$(IntDir)r_opengl.lib</ImportLibrary> <ImportLibrary>$(IntDir)r_opengl.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@ -258,6 +261,7 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<ImportLibrary>$(IntDir)r_opengl.lib</ImportLibrary> <ImportLibrary>$(IntDir)r_opengl.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>

4
src/hardware/s_openal/s_openal-vc10.vcxproj
View file

@ -125,6 +125,7 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<ImportLibrary>$(IntDir)s_openal.lib</ImportLibrary> <ImportLibrary>$(IntDir)s_openal.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@ -170,6 +171,7 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<ImportLibrary>$(IntDir)s_openal.lib</ImportLibrary> <ImportLibrary>$(IntDir)s_openal.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@ -216,6 +218,7 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<ImportLibrary>$(IntDir)s_openal.lib</ImportLibrary> <ImportLibrary>$(IntDir)s_openal.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@ -262,6 +265,7 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<ImportLibrary>$(IntDir)s_openal.lib</ImportLibrary> <ImportLibrary>$(IntDir)s_openal.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>