forked from Lainports/opnsense-ports
30 lines
941 B
Text
30 lines
941 B
Text
--- SConstruct.orig 2016-01-10 04:35:56 UTC
|
|
+++ SConstruct
|
|
@@ -38,7 +38,7 @@ opts.AddVariables(
|
|
BoolVariable('libkate', 'enable libkate support', 1),
|
|
BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
|
|
)
|
|
-env = Environment(options = opts)
|
|
+env = Environment(options = opts, ENV=os.environ, CC = Split(os.environ['CC']))
|
|
Help(opts.GenerateHelpText(env))
|
|
|
|
pkg_flags="--cflags --libs"
|
|
@@ -152,7 +152,6 @@ if not env.GetOption('clean'):
|
|
"libavcodec >= 52.30.0",
|
|
"libpostproc",
|
|
"libswscale",
|
|
- "libswresample",
|
|
"libavutil",
|
|
]
|
|
if os.path.exists("./ffmpeg"):
|
|
@@ -214,9 +213,8 @@ if not env.GetOption('clean'):
|
|
env.Append(CCFLAGS=[
|
|
'-DHAVE_ICONV'
|
|
])
|
|
- if conf.CheckLib('iconv'):
|
|
- env.Append(LIBS=['iconv'])
|
|
|
|
+ env.Append(LIBS=['m'])
|
|
if env['crossmingw']:
|
|
env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
|
|
env.Append(LIBS=['m'])
|