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> <name>OpenRS2 GL Natives</name>
<build> <profiles>
<plugins> <profile>
<plugin> <id>unix</id>
<groupId>com.github.maven-nar</groupId> <activation>
<artifactId>nar-maven-plugin</artifactId> <os>
<configuration> <family>unix</family>
<linker> </os>
<sysLibs> </activation>
<sysLib> <build>
<type>shared</type> <plugins>
<name>GL</name> <plugin>
</sysLib> <groupId>com.github.maven-nar</groupId>
<sysLib> <artifactId>nar-maven-plugin</artifactId>
<type>shared</type> <configuration>
<name>GLX</name> <linker>
</sysLib> <sysLibs>
<sysLib> <sysLib>
<type>shared</type> <type>shared</type>
<name>jawt</name> <name>GL</name>
</sysLib> </sysLib>
</sysLibs> <sysLib>
</linker> <type>shared</type>
</configuration> <name>GLX</name>
</plugin> </sysLib>
</plugins> <sysLib>
</build> <type>shared</type>
<name>jawt</name>
</sysLib>
</sysLibs>
</linker>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

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

Loading…
Cancel
Save