restrict use of absolute paths as much as possible

This commit is contained in:
berkeviktor@aol.com
2010-11-12 04:11:27 +01:00
parent 9cbe171fd9
commit f98ac35d9e
3 changed files with 8 additions and 16 deletions

View File

@ -3,12 +3,6 @@ include "..\..\src\makeinc.mak"
TARGET = xcperl-510.dll
PERLLIB = perl510
!ifdef X64
PERLPATH = c:\mozilla-build\perl-5.10-x64\lib\CORE
!else
PERLPATH = c:\mozilla-build\perl-5.10-x86\lib\CORE
!endif
all: $(TARGET)
perl.def:
@ -18,7 +12,7 @@ perl.def:
echo xchat_plugin_get_info >> perl.def
perl.obj: perl.c
$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERLPATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL510PATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
perl.c: xchat.pm.h
@ -26,7 +20,7 @@ xchat.pm.h: Xchat.pm IRC.pm
perl.exe generate_header
$(TARGET): perl.obj perl.def
$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERLPATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERL510PATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
clean:
@del $(TARGET)

View File

@ -3,12 +3,6 @@ include "..\..\src\makeinc.mak"
TARGET = xcperl-512.dll
PERLLIB = perl512
!ifdef X64
PERLPATH = c:\mozilla-build\perl-5.12-x64\lib\CORE
!else
PERLPATH = c:\mozilla-build\perl-5.12-x86\lib\CORE
!endif
all: $(TARGET)
perl.def:
@ -18,7 +12,7 @@ perl.def:
echo xchat_plugin_get_info >> perl.def
perl.obj: perl.c
$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERLPATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL512PATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
perl.c: xchat.pm.h
@ -26,7 +20,7 @@ xchat.pm.h: Xchat.pm IRC.pm
perl.exe generate_header
$(TARGET): perl.obj perl.def
$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERLPATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERL512PATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
clean:
@del $(TARGET)