Move UNIX-specific flags to the unix profile

pull/48/head
Graham 5 years ago
parent c9d29a71d8
commit 5e7a4d70cd
  1. 62
      gl-natives/pom.xml
  2. 19
      pom.xml

@ -13,30 +13,40 @@
<name>OpenRS2 GL Natives</name>
<build>
<plugins>
<plugin>
<groupId>com.github.maven-nar</groupId>
<artifactId>nar-maven-plugin</artifactId>
<configuration>
<linker>
<sysLibs>
<sysLib>
<type>shared</type>
<name>GL</name>
</sysLib>
<sysLib>
<type>shared</type>
<name>GLX</name>
</sysLib>
<sysLib>
<type>shared</type>
<name>jawt</name>
</sysLib>
</sysLibs>
</linker>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>unix</id>
<activation>
<os>
<family>unix</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.maven-nar</groupId>
<artifactId>nar-maven-plugin</artifactId>
<configuration>
<linker>
<sysLibs>
<sysLib>
<type>shared</type>
<name>GL</name>
</sysLib>
<sysLib>
<type>shared</type>
<name>GLX</name>
</sysLib>
<sysLib>
<type>shared</type>
<name>jawt</name>
</sysLib>
</sysLibs>
</linker>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

@ -186,21 +186,10 @@
</libraries>
<c>
<optimize>full</optimize>
<options>
<option>-Wall</option>
<option>-Wextra</option>
<option>-pedantic</option>
<option>-Wno-unused-parameter</option>
</options>
</c>
<java>
<include>true</include>
</java>
<linker>
<options>
<option>-L${java.home}/lib</option>
</options>
</linker>
</configuration>
</plugin>
<plugin>
@ -302,6 +291,14 @@
<groupId>com.github.maven-nar</groupId>
<artifactId>nar-maven-plugin</artifactId>
<configuration>
<c>
<options>
<option>-Wall</option>
<option>-Wextra</option>
<option>-pedantic</option>
<option>-Wno-unused-parameter</option>
</options>
</c>
<linker>
<options>
<option>-L${java.home}/lib</option>

Loading…
Cancel
Save