Commit 92b4432f authored by nanahira's avatar nanahira

Merge branch 'develop' into server-develop

parents 367f3d62 3758d30a
#!/bin/sh
cp -r premake/* .
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -2,11 +2,5 @@ project "cminiaudio"
kind "StaticLib"
files { "*.c", "*.h" }
filter "action:vs*"
forceincludes { "stb_vorbis.h" }
filter "not action:vs*"
forceincludes { "./stb_vorbis.h" }
filter "system:linux"
links { "dl", "pthread", "m" }
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -273,6 +273,9 @@ end
filter "action:vs*"
cdialect "C11"
if not WINXP_SUPPORT then
conformancemode "On"
end
vectorextensions "SSE2"
buildoptions { "/utf-8" }
defines { "_CRT_SECURE_NO_WARNINGS" }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment