Changeset 0ca651f00fca42b6edbd89f9f36bb24e283800d8

Show
Ignore:
Timestamp:
11/09/06 11:07:58 (2 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1157965678 +0000
git-parent:

[7483d6886f3fd607ac8781b9e4a5d9b5f8e176ba]

git-author:
Sam Hocevar <sam@videolan.org> 1157965678 +0000
Message:
  • Don't use PIC on WIN32.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • mozilla/Makefile.am

    r7483d68 r0ca651f  
    153153endif 
    154154 
     155if HAVE_WIN32 
     156pic = 
     157else 
     158pic = pic 
     159endif 
     160 
    155161libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) 
    156162libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` 
     
    160166 
    161167libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) 
    162 libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \ 
     168libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla $(pic)` \ 
    163169                 $(CPPFLAGS_mozilla_EXTRA) 
    164 libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \ 
     170libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \ 
    165171                   $(CPPFLAGS_mozilla_EXTRA) 
    166 LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin pic
     172LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)
    167173libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc) 
    168174 
     
    177183############################################################################### 
    178184stamp-pic: 
    179     @for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \ 
     185    @for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \ 
    180186      if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \ 
    181187        rm -f $@; \ 
  • src/Makefile.am

    r86dd8db r0ca651f  
    187187else 
    188188lib_LIBRARIES = libvlc.a 
     189endif 
     190 
     191if HAVE_WIN32 
     192pic = 
     193else 
     194pic = pic 
    189195endif 
    190196