Reverted previous changes and also removed --cc flag from premake.

OmarAssadi · Sep 17, 2017 · 99a8b9d · 99a8b9d
1 parent cb09550
commit 99a8b9d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ gmsv_serversecure_win32:
  only:
  - tags
  variables:
- PREMAKE5: "$\"CI_PROJECT_DIR/dependencies/windows/premake-core/premake5.exe\""
+ PREMAKE5: "$CI_PROJECT_DIR/dependencies/windows/premake-core/premake5.exe"
  script: "& \"$CI_PROJECT_DIR/ci.ps1\""
  artifacts:
  paths:
@@ -29,7 +29,7 @@ gmsv_serversecure_linux:
  variables:
  PROJECT_OS: "linux"
  TARGET_OS: "linux"
- PREMAKE5: "\"$CI_PROJECT_DIR/dependencies/linux/premake-core/premake5\""
+ PREMAKE5: "$CI_PROJECT_DIR/dependencies/linux/premake-core/premake5"
  CXX: "g++-4.9"
  CC: "gcc-4.9"
  script: "$CI_PROJECT_DIR/ci.sh"
@@ -45,7 +45,7 @@ gmsv_serversecure_macosx:
  variables:
  PROJECT_OS: "macosx"
  TARGET_OS: "osx"
- PREMAKE5: "\"$CI_PROJECT_DIR/dependencies/macosx/premake-core/premake5\" --cc=clang"
+ PREMAKE5: "$CI_PROJECT_DIR/dependencies/macosx/premake-core/premake"
  CXX: "g++"
  CC: "gcc"
  script: "$CI_PROJECT_DIR/ci.sh"

diff --git a/.travis.yml b/.travis.yml
@@ -26,10 +26,12 @@ install:
  - export TARGET_OS=$TRAVIS_OS_NAME
  - export REPOSITORY_DIR=$TRAVIS_BUILD_DIR
  - if [ $TRAVIS_OS_NAME = "osx" ]; then
- export PREMAKE5="\"$DEPENDENCIES/macosx/premake-core/premake5\" --cc=clang";
+ export PREMAKE5="$DEPENDENCIES/macosx/premake-core/premake5";
  export PROJECT_OS=macosx;
+ export CXX=g++;
+ export CC=gcc;
  elif [ $TRAVIS_OS_NAME = "linux" ]; then
- export PREMAKE5="\"$DEPENDENCIES/linux/premake-core/premake5\"";
+ export PREMAKE5="$DEPENDENCIES/linux/premake-core/premake5";
  export PROJECT_OS=linux;
  export CXX=g++-4.9;
  export CC=gcc-4.9;

diff --git a/ci.ps1 b/ci.ps1
@@ -68,7 +68,7 @@ if( !( ( Get-Item "$env:PREMAKE5" -ErrorAction SilentlyContinue ) -is [System.IO
 }
 
 cd "$env:REPOSITORY_DIR/projects"
-& $env:PREMAKE5 vs2017
+& "$env:PREMAKE5" vs2017
 cd "$env:REPOSITORY_DIR/projects/windows/vs2017"
 
 msbuild serversecure.sln /p:Configuration=Release

diff --git a/ci.sh b/ci.sh
@@ -48,7 +48,7 @@ if [ ! -f "$PREMAKE5" ]; then
 fi
 
 cd "$REPOSITORY_DIR/projects"
-$PREMAKE5 gmake
+"$PREMAKE5" gmake
 cd "$REPOSITORY_DIR/projects/$PROJECT_OS/gmake"
 
 make