adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix icon on Windows with MinGW/MSYS2 builds, from Ala-lala

Browse Source
This commit is contained in:
Michael Martin
2020-06-08 16:09:05 -07:00
parent a8785656eb
commit f39a37ff2f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/Makefile.build
+1 -1
View File
@@ -56,7 +56,7 @@ $(OBJDIR)%.m.d: $(BUILD_ROOT)%.m
fi fi
$(call act,act_mkdep_m,MKDEP ,$@) $(call act,act_mkdep_m,MKDEP ,$@)
%.rc.o: %.rc $(OBJDIR)%.rc.o: $(BUILD_ROOT)%.rc
@DIR=$(dir $@); \ @DIR=$(dir $@); \
if [ ! -d $$DIR ]; then \ if [ ! -d $$DIR ]; then \
mkdir -p "$$DIR"; \ mkdir -p "$$DIR"; \
sc2/build/unix/build.sh
+1 -1
View File
@@ -99,7 +99,7 @@ if [ -z "$TARGET" ]; then
fi fi
BUILD_PROJECT="$TARGET" BUILD_PROJECT="$TARGET"
export TARGET BUILD_PROJECT ECHON export TARGET BUILD_PROJECT ECHON
export PREPROC_C MKDEP_C COMPILE_C PREPROC_CXX MKDEP_CXX COMPILE_CXX PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC LINK export PREPROC_C MKDEP_C COMPILE_C PREPROC_CXX MKDEP_CXX COMPILE_CXX PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC WINDRES LINK
export "${BUILD_PROJECT}_CFLAGS" "${BUILD_PROJECT}_CXXFLAGS" "${BUILD_PROJECT}_LDFLAGS" export "${BUILD_PROJECT}_CFLAGS" "${BUILD_PROJECT}_CXXFLAGS" "${BUILD_PROJECT}_LDFLAGS"
# Add trailing / from objs dir # Add trailing / from objs dir
sc2/src/res/Makeinfo
+1 -1
View File
@@ -1,6 +1,6 @@
case "$HOST_SYSTEM" in case "$HOST_SYSTEM" in
MINGW32*) MINGW32*)
uqm_EXTRA_OFILES="UrQuanMasters.rc.o" uqm_RCFILES="UrQuanMasters.rc"
;; ;;
esac esac