aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Galdrikian <[email protected]>2024-12-20 16:49:55 -0800
committerBryan Galdrikian <[email protected]>2024-12-20 16:49:55 -0800
commit53a9a83fc3bc039e6d70cb55312a3c84fde832c7 (patch)
tree2e979d51d8e00e1348236057f1d4d28dac27e353
parentMaking python.sh executable (diff)
downloadblast-53a9a83fc3bc039e6d70cb55312a3c84fde832c7.tar.xz
blast-53a9a83fc3bc039e6d70cb55312a3c84fde832c7.zip
Fixed linux project generationHEADmaster
-rwxr-xr-x[-rw-r--r--]buildtools/packman/packman (renamed from buildtools/packman/packman.txt)0
-rwxr-xr-xgenerate_projects_linux.sh3
-rwxr-xr-xgenerate_projects_linux_ue4_crosscompile.bat3
-rwxr-xr-xgenerate_projects_vc15win64.bat4
4 files changed, 7 insertions, 3 deletions
diff --git a/buildtools/packman/packman.txt b/buildtools/packman/packman
index b222d30..b222d30 100644..100755
--- a/buildtools/packman/packman.txt
+++ b/buildtools/packman/packman
diff --git a/generate_projects_linux.sh b/generate_projects_linux.sh
index 84bc743..0be7e22 100755
--- a/generate_projects_linux.sh
+++ b/generate_projects_linux.sh
@@ -10,4 +10,5 @@ echo "Getting build platform dependencies for Linux ..."
source $BLAST_ROOT_DIR"/buildtools/packman/packman" pull $BLAST_ROOT_DIR"/buildtools/build_platform_deps.xml" --platform linux
echo "Getting target platform dependencies for Linux ..."
-source $BLAST_ROOT_DIR"/buildtools/packman/packman" pull $BLAST_ROOT_DIR"/target_platform_deps.xml" --platform linux --postscript $BLAST_ROOT_DIR"/buildtools/cmake_projects_linux.sh"
+source $BLAST_ROOT_DIR"/buildtools/packman/packman" pull $BLAST_ROOT_DIR"/target_platform_deps.xml" --platform linux
+source $BLAST_ROOT_DIR"/buildtools/cmake_projects_linux.sh"
diff --git a/generate_projects_linux_ue4_crosscompile.bat b/generate_projects_linux_ue4_crosscompile.bat
index 8d1e7d5..0fbd9ba 100755
--- a/generate_projects_linux_ue4_crosscompile.bat
+++ b/generate_projects_linux_ue4_crosscompile.bat
@@ -14,7 +14,8 @@
)
::Need linux libs, but windows tools, run us again to get the path
-@call "%~dp0buildtools\packman\packman.cmd" pull "%~dp0target_platform_deps.xml" --platform linux --postscript "%~dp0buildtools\cmake_projects_linux_ue4_crosscompile.bat"
+@call "%~dp0buildtools\packman\packman.cmd" pull "%~dp0target_platform_deps.xml" --platform linux
+@call "%~dp0buildtools\cmake_projects_linux_ue4_crosscompile.bat"
@if %ERRORLEVEL% neq 0 (
@exit /b %errorlevel%
) else (
diff --git a/generate_projects_vc15win64.bat b/generate_projects_vc15win64.bat
index f10d951..39bcff1 100755
--- a/generate_projects_vc15win64.bat
+++ b/generate_projects_vc15win64.bat
@@ -11,7 +11,9 @@
@if %ERRORLEVEL% neq 0 exit /b %errorlevel%
@echo Getting target platform dependencies for win.x86_64.vc150 ...
-@call "%~dp0buildtools\packman\packman.cmd" pull "%~dp0target_platform_deps.xml" --platform win.x86_64.vc150 --postscript "%~dp0buildtools\cmake_projects_vc15win64.bat"
+@call "%~dp0buildtools\packman\packman.cmd" pull "%~dp0target_platform_deps.xml" --platform win.x86_64.vc150
+@call "%~dp0buildtools\cmake_projects_vc15win64.bat"
+
@if %ERRORLEVEL% neq 0 (
@exit /b %errorlevel%
) else (