Merge branch 'master' of rtime.felk.cvut.cz:frescor/demo

diff --git a/.gitmodules b/.gitmodules
index 22d0964209bb63bb5a66dfc825b836e747ad4a98..14dd6ab773f46a2150a3fcf2c59b73a83bdb6b1b 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "src/forb"]
        path = src/forb
        url = ../forb.git
-[submodule "src/frsh_forb"]
-       path = src/frsh_forb
-       url = ../frsh_forb.git
+[submodule "src/frsh"]
+       path = src/frsh
+       url = ../frsh.git
 [submodule "src/fwp"]
        path = src/fwp
        url = ../fwp.git
@@ -27,4 +27,4 @@
        url = git://frsh-forb.git.sourceforge.net/gitroot/frsh-forb/frsh-include
 [submodule "src/libswscale"]
        path = src/libswscale
-       url = git://git.ffmpeg.org/libswscale
+       url = git://gitorious.org/libswscale/mainline.git

diff --git a/README b/README
index 01a448234c1cdf75aedb8d27bde905225ec4b1be..419cc9cc0b51f1f02764506e69d6f5bc5971e74c 100644 (file)
--- a/README
+++ b/README
@@ -10,6 +10,4 @@ which does all the steps):
 2) Compile it
 
    cd build
-   make default-config
-   echo CONFIG_AQUOSA=y >>config.omk
    make

diff --git a/build/config.target b/build/config.target
index 780485ef0c4b156efdd129bcb8b8986a3f304019..f4fa427d9cbf322e8d93fa6f45f4c2843556813a 100644 (file)
--- a/build/config.target
+++ b/build/config.target
@@ -82,7 +82,7 @@ CONFIG_DISKBFQ=y
 
 # Instead, we call normal gcc with parameters which mgcc adds
 
-CFLAGS=$(ARCH_GCC_OPTS) -Wall -Wuninitialized -g -O2 $(CFLAGS-y) -D_REENTRANT -D$(PLATFORM) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
+CFLAGS=$(ARCH_GCC_OPTS) -Wall -Wuninitialized -g -O2 $(CFLAGS-y) -D_REENTRANT -D$(PLATFORM) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -fPIC
 
 LDFLAGS=$(ARCH_LD_OPTS) $(LIBS_PATH) $(LIBS)
 LDFLAGS += '-Wl,-rpath,$$ORIGIN/../lib' -z origin --enable-new-dtags

diff --git a/build/frsh b/build/frsh
new file mode 120000 (symlink)
index 0000000..a0f3b91
--- /dev/null
+++ b/build/frsh
@@ -0,0 +1 @@
+../src/frsh
\ No newline at end of file

diff --git a/build/frsh_forb b/build/frsh_forb
deleted file mode 120000 (symlink)
index 2e76579..0000000
--- a/build/frsh_forb
+++ /dev/null
@@ -1 +0,0 @@
-../src/frsh_forb
\ No newline at end of file

diff --git a/src/frsh_forb b/src/frsh
similarity index 100%
rename from src/frsh_forb
rename to src/frsh