Skip to content

Commit

Permalink
build: revert Windows builds to MSVC
Browse files Browse the repository at this point in the history
Since the 3.3.4 release, various AI-based anti-malware/virus systems
have been triggering false positives with LWJGL artifacts. This is a
desperate attempt to eliminate them. Migrating to Clang-CL was the only
major change between 3.3.3 and 3.3.4.
  • Loading branch information
Spasi committed Jan 4, 2025
1 parent 20e3ac8 commit cb440f8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
12 changes: 7 additions & 5 deletions config/windows/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<macrodef name="compile">
<attribute name="dest" default="${dest}"/>
<attribute name="useClang" default="true"/>
<attribute name="useClang" default="false"/>
<attribute name="flags" default=""/>
<attribute name="simple" default="false"/>
<attribute name="relative" default="true"/>
Expand Down Expand Up @@ -46,7 +46,7 @@

<macrodef name="build">
<attribute name="module"/>
<attribute name="useClang" default="true"/>
<attribute name="useClang" default="false"/>
<attribute name="flags" default="/W2"/>
<attribute name="simple" default="false"/>
<element name="beforeCompile" optional="true"/>
Expand Down Expand Up @@ -150,7 +150,7 @@ EXPORTS

<macrodef name="build_simple">
<attribute name="module"/>
<attribute name="useClang" default="true"/>
<attribute name="useClang" default="false"/>
<sequential>
<build module="@{module}" useClang="@{useClang}" simple="true" if:true="${binding.@{module}}"/>
</sequential>
Expand Down Expand Up @@ -235,7 +235,8 @@ EXPORTS
<!-- meshoptimizer -->
<sequential if:true="${binding.meshoptimizer}">
<local name="meshoptimizer.useClang"/>
<condition property="meshoptimizer.useClang" value="false" else="true"><isset property="build.arch.arm64"/></condition>
<!--<condition property="meshoptimizer.useClang" value="false" else="true"><isset property="build.arch.arm64"/></condition>-->
<property name="meshoptimizer.useClang" value="false"/>
<build module="meshoptimizer" useClang="${meshoptimizer.useClang}" simple="true">
<beforeCompile>
<compile useClang="${meshoptimizer.useClang}" flags="/DMESHOPTIMIZER_NO_WRAPPERS">
Expand Down Expand Up @@ -314,7 +315,8 @@ EXPORTS
<!-- Remotery -->
<sequential if:true="${binding.remotery}">
<local name="remotery.useClang"/>
<condition property="remotery.useClang" value="false" else="true"><isset property="build.arch.x86"/></condition>
<!--<condition property="remotery.useClang" value="false" else="true"><isset property="build.arch.x86"/></condition>-->
<property name="remotery.useClang" value="false"/>
<build module="remotery" useClang="${remotery.useClang}">
<compileargs>
<arg value="/I${src.main}"/>
Expand Down
1 change: 1 addition & 0 deletions doc/notes/3.3.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ This build includes the following changes:
#### Fixes

- GLFW: Library override paths with Unicode characters are now supported on Windows.
- Windows: Reverted to MSVC in an attempt to fix #1005.

#### Breaking Changes

0 comments on commit cb440f8

Please sign in to comment.