Skip to content

Commit

Permalink
Avoid manually setting project character sets in Windows premake file (
Browse files Browse the repository at this point in the history
  • Loading branch information
chalcolith authored and jemc committed Apr 9, 2016
1 parent e07dcd6 commit ce08b1d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,6 @@ Building Pony requires [Premake 5](https://premake.github.io).
- Get the [PonyC source](https://github.com/ponylang/ponyc).
- Run `premake5.exe --with-tests --to=..\vs vs2015` to generate the PonyC
solution.
- Change the **Character Set** property of each project in the PonyC solution
to **Not Set**.
- Build ponyc.sln in Release mode.

In order to run the pony compiler, you'll need a few libraries in your
Expand Down
8 changes: 8 additions & 0 deletions premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
}
excludes { "src/libponyc/**.cc" }
configuration "vs*"
characterset "MBCS"
defines {
"PONY_USE_BIGINT"
}
Expand All @@ -201,6 +202,7 @@
"-std=gnu11"
}
configuration "vs*"
characterset "MBCS"
cppforce { "src/libponyrt/**.c" }
configuration "*"

Expand All @@ -218,6 +220,7 @@
configuration "gmake"
buildoptions "-std=gnu11"
configuration "vs*"
characterset "MBCS"
cppforce { "src/ponyc/**.c" }
configuration "*"
link_libponyc()
Expand All @@ -232,6 +235,8 @@ if ( _OPTIONS["with-tests"] or _OPTIONS["run-tests"] ) then
buildoptions {
"-std=gnu++11"
}
configuration "vs*"
characterset "MBCS"
configuration "*"

includedirs {
Expand All @@ -256,6 +261,7 @@ if ( _OPTIONS["with-tests"] or _OPTIONS["run-tests"] ) then
"test/libponyc/**.cc"
}
configuration "vs*"
characterset "MBCS"
defines { "PONY_USE_BIGINT" }
configuration "*"
link_libponyc()
Expand All @@ -270,6 +276,8 @@ if ( _OPTIONS["with-tests"] or _OPTIONS["run-tests"] ) then
"src/libponyrt"
}
files { "test/libponyrt/**.cc" }
configuration "vs*"
characterset "MBCS"
end

if _ACTION == "clean" then
Expand Down

0 comments on commit ce08b1d

Please sign in to comment.