lib/sdl & opengles1: fix pkgconfig usage

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/lib/mnit/opengles1.nit b/lib/mnit/opengles1.nit
index af44be9..1f081d6 100644 (file)
--- a/lib/mnit/opengles1.nit
+++ b/lib/mnit/opengles1.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # OpenGL ES1 general support (most of it)
-module opengles1
+module opengles1 is pkgconfig("glesv1_cm", "x11", "egl")
 
 import mnit_display
 

diff --git a/lib/mnit_linux/linux_opengles1.nit b/lib/mnit_linux/linux_opengles1.nit
index 00a037f..00a1175 100644 (file)
--- a/lib/mnit_linux/linux_opengles1.nit
+++ b/lib/mnit_linux/linux_opengles1.nit
@@ -14,11 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module linux_opengles1 is
-       pkgconfig("glesv1_cm", "x11", "egl")
-       c_compiler_option(exec("sdl-config", "--cflags"))
-       c_linker_option(exec("sdl-config", "--libs"), "-lSDL_image -lSDL_ttf")
-end
+module linux_opengles1
 
 import mnit # for
 # import opengles1

diff --git a/lib/sdl.nit b/lib/sdl.nit
index 550e185..0ac97b4 100644 (file)
--- a/lib/sdl.nit
+++ b/lib/sdl.nit
@@ -17,7 +17,7 @@
 # SDL display support (used in Linux for windows and inputes only)
 module sdl is
        c_compiler_option(exec("sdl-config", "--cflags"))
-       c_linker_option(exec("sdl-config", "--libs"), "-lSDL_ttf")
+       c_linker_option(exec("sdl-config", "--libs"), "-lSDL_image -lSDL_ttf")
 end
 
 import mnit_display