* vlc core compiles under QNX RTOS. Now if anyone feels like tidying

[vlc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f118ae38d36ef14d4faf790ab92f88c3e9d72c75..ebd22f22344d675859b1fad29977248626b7d3da 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,7 @@ PROGRAM_BUILD = `date` $(USER)
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including SYS_xx. It will be passed to C compiler.
-DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr a-z. A-Z_)
+DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr '[a-z].' '[A-Z]_')
 
 # On Linux activate 64-bit off_t (by default under BSD)
 ifneq (,$(findstring linux,$(SYS)))
@@ -301,6 +301,9 @@ PLUGIN_BEOS =       plugins/beos/beos.o \
                plugins/beos/DrawingTidbits.o \
                plugins/beos/TransportButton.o
 
+PLUGIN_DARWIN =        plugins/darwin/darwin.o \
+               plugins/darwin/aout_darwin.o
+
 PLUGIN_DSP =   plugins/dsp/dsp.o \
                plugins/dsp/aout_dsp.o
 
@@ -360,6 +363,10 @@ PLUGIN_IDCTMMX =   plugins/idct/idctmmx.o \
 PLUGIN_IDCTMMXEXT =    plugins/idct/idctmmxext.o \
                        plugins/idct/idct_common.o
 
+PLUGIN_MACOSX =        plugins/macosx/macosx.o \
+               plugins/macosx/intf_macosx.o \
+               plugins/macosx/vout_macosx.o
+
 PLUGIN_MGA =   plugins/mga/mga.o \
                plugins/mga/vout_mga.o
 
@@ -403,6 +410,7 @@ PLUGIN_YUVMMX =     plugins/yuv/yuvmmx.o \
 
 STD_PLUGIN_OBJ = \
                $(PLUGIN_ALSA) \
+               $(PLUGIN_DARWIN) \
                $(PLUGIN_DSP) \
                $(PLUGIN_DUMMY) \
                $(PLUGIN_DVD) \
@@ -413,6 +421,7 @@ STD_PLUGIN_OBJ = \
                $(PLUGIN_IDCTCLASSIC) \
                $(PLUGIN_IDCTMMX) \
                $(PLUGIN_IDCTMMXEXT) \
+               $(PLUGIN_MACOSX) \
                $(PLUGIN_MGA) \
                $(PLUGIN_MOTION) \
                $(PLUGIN_MOTIONMMX) \
@@ -623,9 +632,13 @@ ifeq ($(SYS),beos)
        $(CC) $(CFLAGS) $(LCFLAGS) -Xlinker -soname=_APP_ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
        rm -f ./plugins/_APP_
        ln -s ../vlc ./plugins/_APP_
+else
+ifeq ($(SYS),nto-qnx)
+       $(CC) $(CFLAGS) $(LCFLAGS) -Xlinker -export-dynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
 else
        $(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic @DYNAMIC_FLAG@ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) 
 endif
+endif
 
 #
 # Plugin targets
@@ -641,6 +654,12 @@ else
        $(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^ -laudiofile -lesd
 endif
 
+lib/macosx.so: $(PLUGIN_MACOSX)
+       $(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^
+
+lib/darwin.so: $(PLUGIN_DARWIN)
+       $(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^
+
 lib/dsp.so: $(PLUGIN_DSP)
        $(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^
 
@@ -656,8 +675,13 @@ lib/alsa.so: $(PLUGIN_ALSA)
 lib/fb.so: $(PLUGIN_FB)
        $(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^
 
+ifeq ($(SYS),nto-qnx)
+lib/x11.so: $(PLUGIN_X11)
+       $(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext -lsocket
+else
 lib/x11.so: $(PLUGIN_X11)
        $(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext
+endif
 
 lib/mga.so: $(PLUGIN_MGA)
        $(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext