Fix ignorelib seperator and link to winmm and wsock32 for use with static libs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1054 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
7250eff5b6
commit
93476b8fe4
|
@ -71,11 +71,11 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
AdditionalDependencies="SDL.lib SDLmain.lib SDL_net.lib jpeg.lib png.lib zlib.lib ogg.lib vorbis.lib vorbisfile.lib mad.lib physfs.lib OpenAL32.lib OpenGL32.lib GLU32.lib shfolder.lib"
|
AdditionalDependencies="SDL.lib SDLmain.lib SDL_net.lib jpeg.lib png.lib zlib.lib ogg.lib vorbis.lib vorbisfile.lib mad.lib physfs.lib OpenAL32.lib OpenGL32.lib GLU32.lib shfolder.lib winmm.lib wsock32.lib"
|
||||||
OutputFile="$(OutDir)\$(ProjectName)-Dbg.exe"
|
OutputFile="$(OutDir)\$(ProjectName)-Dbg.exe"
|
||||||
LinkIncremental="2"
|
LinkIncremental="2"
|
||||||
AdditionalLibraryDirectories=""__DEVPKG__\lib""
|
AdditionalLibraryDirectories=""__DEVPKG__\lib""
|
||||||
IgnoreDefaultLibraryNames="msvcrt.lib libcmt.lib"
|
IgnoreDefaultLibraryNames="msvcrt.lib,libcmt.lib"
|
||||||
GenerateDebugInformation="true"
|
GenerateDebugInformation="true"
|
||||||
SubSystem="2"
|
SubSystem="2"
|
||||||
TargetMachine="1"
|
TargetMachine="1"
|
||||||
|
@ -155,7 +155,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
AdditionalDependencies="SDL.lib SDLmain.lib SDL_net.lib jpeg.lib png.lib zlib.lib ogg.lib vorbis.lib vorbisfile.lib mad.lib physfs.lib OpenAL32.lib OpenGL32.lib GLU32.lib shfolder.lib"
|
AdditionalDependencies="SDL.lib SDLmain.lib SDL_net.lib jpeg.lib png.lib zlib.lib ogg.lib vorbis.lib vorbisfile.lib mad.lib physfs.lib OpenAL32.lib OpenGL32.lib GLU32.lib shfolder.lib winmm.lib wsock32.lib"
|
||||||
LinkIncremental="1"
|
LinkIncremental="1"
|
||||||
AdditionalLibraryDirectories=""__DEVPKG__\lib""
|
AdditionalLibraryDirectories=""__DEVPKG__\lib""
|
||||||
IgnoreDefaultLibraryNames="libcmt.lib"
|
IgnoreDefaultLibraryNames="libcmt.lib"
|
||||||
|
@ -623,10 +623,6 @@
|
||||||
RelativePath="..\src\mission.c"
|
RelativePath="..\src\mission.c"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\lib\sound\mixer_stub.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\lib\framework\mono.c"
|
RelativePath="..\lib\framework\mono.c"
|
||||||
>
|
>
|
||||||
|
@ -759,10 +755,6 @@
|
||||||
RelativePath="..\lib\ivis_opengl\piepalette.c"
|
RelativePath="..\lib\ivis_opengl\piepalette.c"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\lib\ivis_common\piestate.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\lib\ivis_opengl\piestate.c"
|
RelativePath="..\lib\ivis_opengl\piestate.c"
|
||||||
>
|
>
|
||||||
|
@ -785,6 +777,10 @@
|
||||||
/>
|
/>
|
||||||
</FileConfiguration>
|
</FileConfiguration>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\lib\ivis_common\piestate.c"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\lib\ivis_opengl\pietexture.c"
|
RelativePath="..\lib\ivis_opengl\pietexture.c"
|
||||||
>
|
>
|
||||||
|
|
Loading…
Reference in New Issue