fix(driftfx): macOS & Linux builds

Ogsinex · Dec 27, 2019 · c7be544 · c7be544
1 parent f3e08f9
commit c7be544
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/config/linux/build.xml b/config/linux/build.xml
@@ -251,6 +251,7 @@
             </source>
             <link>
                 <arg value="-latomic"/>
+                <arg value="-lX11"/>
                 <arg value="-l:libGL.so.1" unless:set="gcc.libpath.opengl"/>
                 <arg line="-L ${gcc.libpath.opengl} -l:libGL.so.1" if:set="gcc.libpath.opengl"/>
             </link>

diff --git a/config/macos/build.xml b/config/macos/build.xml
@@ -211,6 +211,11 @@
         <!-- DriftFX -->
         <build module="driftfx" lang="c++" if:true="${binding.driftfx}">
             <beforeCompile>
+                <compile>
+                    <fileset dir=".">
+                        <include name="${src.main}/src/**/*.m"/>
+                    </fileset>
+                </compile>
                 <compile lang="c++" flags="-DGLEW_STATIC -DBUILDING_DLL">
                     <arg value="-I${src.main.rel}/include"/>
                     <arg value="-I${src.main.rel}/src"/>
@@ -220,7 +225,6 @@
                     <fileset dir="." includes="${src.main}/lib/utils/src/*"/>
                     <fileset dir=".">
                         <include name="${src.main}/src/**/*.cpp"/>
-                        <include name="${src.main}/src/**/*.m"/>
                         <exclude name="${src.main}/src/gl/glx/*"/>
                         <exclude name="${src.main}/src/gl/wgl/*"/>
                         <exclude name="${src.main}/src/prism/d3d/*"/>