Skip to content

[tools] Fix mingw toolchain rc file handling #1285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobil4sk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[tools] Fix mingw toolchain rc file handling #1285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions toolchain/mingw-toolchain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@

<section if="linux_host||mac_host">
<section if="HXCPP_M64">
<set name="HXCPP_MINGW_EXE" value="x86_64-w64-mingw32-g++" unless="HXCPP_MINGW_EXE" />
<set name="MINGW_ROOT" value="/usr/x86_64-w64-mingw32" unless="MINGW_ROOT" />
<set name="ABITRIPLE" value="x86_64-w64-mingw32" />
</section>
<section unless="HXCPP_M64">
<set name="HXCPP_MINGW_EXE" value="i686-w64-mingw32-g++" unless="HXCPP_MINGW_EXE" />
<set name="MINGW_ROOT" value="/usr/i686-w64-mingw32" unless="MINGW_ROOT" />
<set name="ABITRIPLE" value="i686-w64-mingw32" />
</section>
<set name="EXEPREFIX" value="${ABITRIPLE}" />
<set name="HXCPP_MINGW_EXE" value="${EXEPREFIX}-g++" unless="HXCPP_MINGW_EXE" />
<set name="HXCPP_MINGW_RC_EXE" value="${EXEPREFIX}-windres" unless="HXCPP_MINGW_RC_EXE" />
<set name="MINGW_ROOT" value="/usr/${ABITRIPLE}" unless="MINGW_ROOT" />
</section>

<set name="HXCPP_MINGW_EXE" value="g++.exe" unless="HXCPP_MINGW_EXE"/>
<set name="HXCPP_MINGW_RC_EXE" value="windres.exe" unless="HXCPP_MINGW_RC_EXE" />


<setup name="mingw" />
Expand Down Expand Up @@ -49,6 +52,9 @@
<objdir value="obj/mingw${OBJEXT}/"/>
<outflag value="-o"/>
<ext value=".o"/>

<rcexe name="${HXCPP_MINGW_RC_EXE}" />
<rcext value=".o" />
</compiler>

<linker id="dll" exe="g++">
Expand Down
Loading