Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
80a6849e
Commit
80a6849e
authored
Jun 24, 2003
by
Sam Hocevar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* configure.ac: removed -lstdc++ LDFLAGS, and used CXXFLAGS to force C++
linkage instead.
parent
e01eb15e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
10 deletions
+16
-10
configure.ac
configure.ac
+16
-10
No files found.
configure.ac
View file @
80a6849e
...
@@ -154,7 +154,8 @@ case "${target_os}" in
...
@@ -154,7 +154,8 @@ case "${target_os}" in
CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
LDFLAGS_vlc="${LDFLAGS_vlc} -lbe"
LDFLAGS_vlc="${LDFLAGS_vlc} -lbe"
LDFLAGS_beos="${LDFLAGS_beos} -lbe -lmedia -ltranslation -ltracker -lgame -lstdc++.r4"
CXXFLAGS_beos="${CXXFLAGS_beos}"
LDFLAGS_beos="${LDFLAGS_beos} -lbe -lmedia -ltranslation -ltracker -lgame"
dnl Check if we have BONE (old net_server doesn't have libsocket.so)
dnl Check if we have BONE (old net_server doesn't have libsocket.so)
AC_CHECK_LIB( socket, connect,
AC_CHECK_LIB( socket, connect,
LDFLAGS_vlc="${LDFLAGS_vlc} -lsocket -lbind"
LDFLAGS_vlc="${LDFLAGS_vlc} -lsocket -lbind"
...
@@ -1437,7 +1438,8 @@ AC_LANG_PUSH(C++)
...
@@ -1437,7 +1438,8 @@ AC_LANG_PUSH(C++)
dnl matroska headers include ebml headers directly... pouah that stinks
dnl matroska headers include ebml headers directly... pouah that stinks
AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
PLUGINS="${PLUGINS} mkv"
PLUGINS="${PLUGINS} mkv"
LDFLAGS_mkv="${LDFLAGS_mkv} -lmatroska -lebml -lstdc++"
CXXFLAGS_mkv="${CXXFLAGS_mkv}"
LDFLAGS_mkv="${LDFLAGS_mkv} -lmatroska -lebml"
],[])
],[])
AC_LANG_POP(C++)
AC_LANG_POP(C++)
fi
fi
...
@@ -2436,8 +2438,9 @@ if test "${enable_skins}" != "no"; then
...
@@ -2436,8 +2438,9 @@ if test "${enable_skins}" != "no"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
PLUGINS="${PLUGINS} skins"
PLUGINS="${PLUGINS} skins"
CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -U_OFF_T_ -U_off_t -fno-rtti -Imodules/gui/skins"
CPPFLAGS_skins="${CPPFLAGS_skins} -U_OFF_T_ -U_off_t -Imodules/gui/skins"
LDFLAGS_skins="${LDFLAGS_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
CXXFLAGS_skins="${CXXFLAGS_skins} -O2 -fno-rtti"
LDFLAGS_skins="${LDFLAGS_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
else
else
if test "${enable_skins}" = "yes"; then
if test "${enable_skins}" = "yes"; then
IMLIB2_PATH="${PATH}"
IMLIB2_PATH="${PATH}"
...
@@ -2447,8 +2450,9 @@ if test "${enable_skins}" != "no"; then
...
@@ -2447,8 +2450,9 @@ if test "${enable_skins}" != "no"; then
fi
fi
PLUGINS="${PLUGINS} skins"
PLUGINS="${PLUGINS} skins"
CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
CPPFLAGS_skins="${CPPFLAGS_skins} -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
LDFLAGS_skins="${LDFLAGS_skins} -lstdc++ -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
CXXFLAGS_skins="${CXXFLAGS_skins} -O2 -fno-rtti"
LDFLAGS_skins="${LDFLAGS_skins} -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
PLUGINS="${PLUGINS} skins"
PLUGINS="${PLUGINS} skins"
fi
fi
fi
fi
...
@@ -2462,8 +2466,9 @@ AC_ARG_ENABLE(basic-skins,
...
@@ -2462,8 +2466,9 @@ AC_ARG_ENABLE(basic-skins,
if test "${enable_basic_skins}" = "yes"; then
if test "${enable_basic_skins}" = "yes"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -U_OFF_T_ -U_off_t -fno-rtti -Imodules/gui/skins"
CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -U_OFF_T_ -U_off_t -Imodules/gui/skins"
LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
CXXFLAGS_basic_skins="${CXXFLAGS_basic_skins} -O2 -fno-rtti"
LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
else
else
IMLIB2_PATH="${PATH}"
IMLIB2_PATH="${PATH}"
...
@@ -2472,8 +2477,9 @@ if test "${enable_basic_skins}" = "yes"; then
...
@@ -2472,8 +2477,9 @@ if test "${enable_basic_skins}" = "yes"; then
AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-basic-skins.])
AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-basic-skins.])
fi
fi
CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -fno-rtti -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lstdc++ -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
CXXFLAGS_basic_skins="${CXXFLAGS_basic_skins} -O2 -fno-rtti"
LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
fi
fi
PLUGINS="${PLUGINS} basic_skins"
PLUGINS="${PLUGINS} basic_skins"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment