Update build scripts for Travis.

.travis.yml

@@ -26,9 +26,8 @@ install:
 
 script: |
   if [ "$TRAVIS_OS_NAME" = "linux" ]; then PREMAKE=premake5-linux-64; else PREMAKE=premake5-osx; fi &&
-  if [ "$TRAVIS_OS_NAME" = "linux" ]; then BUILD_CONF=release_x64; else BUILD_CONF=release_x32; fi &&
   CppSharp/build/$PREMAKE --file=build/premake5.lua gmake &&
-  config=$BUILD_CONF make -C build/gmake/ &&
+  config=release make -C build/gmake/ &&
   TEST_RESULT=0 &&
   for test in build/gmake/lib/Release_*/*.Tests*; do $test || TEST_RESULT=$?; done &&
   exit "$TEST_RESULT"

build/Helpers.lua

@@ -10,7 +10,7 @@ examplesdir = path.getabsolute("../examples");
 testsdir = path.getabsolute("../tests");
 
 builddir = path.getabsolute("./" .. action);
-libdir = path.join(builddir, "lib", "%{cfg.buildcfg}_%{cfg.platform}");
+libdir = path.join(builddir, "lib", "%{cfg.buildcfg}");
 gendir = path.join(builddir, "gen");
 
 function string.starts(str, start)

build/premake5.lua

@@ -8,6 +8,16 @@ dofile "Tests.lua"
 solution "native-binder"
 
   configurations { "Debug", "Release" }
+  architecture "x86_64"
+
+  filter "system:macosx"
+    architecture "x86"
+
+  filter "configurations:Release"
+    flags { "Optimize" }    
+
+  filter {}  
+
   characterset "Unicode"
   symbols "On"
   
@@ -17,11 +27,6 @@ solution "native-binder"
   libdirs { libdir }
 
   startproject "native-binder"
-  
-  configuration "Release"
-    flags { "Optimize" }
-
-  configuration {}
 
   project "native-binder"
     SetupManagedProject()