Skip to content

Commit 1c2c300

Browse files
committed
Building better on Windows
1 parent 7a92a8c commit 1c2c300

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
lines changed

create-project.sh

-6
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,7 @@ function compile()
8989
cmake .. -G "Visual Studio ${VSShortVer} ${VSVer}" -DCMAKE_BUILD_TYPE=RELEASE || exit
9090
MSBuild.exe "${prjname}".sln -property:Configuration=Release -property:Platform=x64 -property:maxCpuCount="${cpus}" || exit
9191

92-
cp Release/"${prjname}".exe . || exit
9392
cp ../UVKBuildTool/build/Release/UVKBuildToolLib.dll . || exit
94-
cp Framework/ThirdParty/yaml-cpp/Release/yaml-cpp.dll . || exit
95-
cp yaml-cpp.dll Release/ || exit
96-
97-
cp Framework/ThirdParty/freetype/Release/freetype.dll . || exit
98-
cp freetype.dll Release/ || exit
9993
else
10094
cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE || exit
10195
make -j "${cpus}" || exit

export.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ fi
8080
if [ "${windows}" == true ]; then
8181
cmake_i .. -G "Visual Studio ${VSShortVer} ${VSVer}" -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX="$2" "${@:4}" || exit
8282
MSBuild.exe "$1".sln -property:Configuration=Release -property:Platform=x64 -property:maxCpuCount="${jobs}" || exit
83-
cp Release/"$1".exe . || exit
84-
cp Release/UntitledImGuiFramework.dll . || exit
83+
cp Release/"$1".exe Release/*.dll . || exit
8584
else
8685
cmake_i .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX="$2" "${@:4}" || exit
8786
make -j "${jobs}" || exit

update.sh

-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ git submodule update --remote --merge --init --recursive
1212
cd build || exit
1313
cmake .. || exit
1414
MSBuild.exe UVKBuildTool.sln -property:Configuration=Release -property:Platform=x64 -property:maxCpuCount="${cpus}" || make -j "${cpus}" || exit
15-
cp Release/UVKBuildTool.exe . 2> /dev/null || echo -n " " || exit
16-
cp Release/UVKBuildToolLib.dll . 2> /dev/null || cp Release/libUVKBuildToolLib.dll . 2> /dev/null || echo -n " "
17-
cp Release/UVKBuildToolLib.lib . 2> /dev/null || cp Release/libUVKBuildToolLib.lib . 2> /dev/null || echo -n " "
18-
cp yaml-cpp/Release/yaml-cpp.dll . 2> /dev/null || cp yaml-cpp/Release/libyaml-cpp.dll . 2> /dev/null || echo -n " "
1915

2016
cd ../../ || exit
2117
echo -e "\x1b[32mSuccessfully updated the framework!\x1b[0m"

0 commit comments

Comments
 (0)