restrict use of absolute paths as much as possible
This commit is contained in:
parent
9cbe171fd9
commit
f98ac35d9e
|
@ -3,12 +3,6 @@ include "..\..\src\makeinc.mak"
|
||||||
TARGET = xcperl-510.dll
|
TARGET = xcperl-510.dll
|
||||||
PERLLIB = perl510
|
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)
|
all: $(TARGET)
|
||||||
|
|
||||||
perl.def:
|
perl.def:
|
||||||
|
@ -18,7 +12,7 @@ perl.def:
|
||||||
echo xchat_plugin_get_info >> perl.def
|
echo xchat_plugin_get_info >> perl.def
|
||||||
|
|
||||||
perl.obj: perl.c
|
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
|
perl.c: xchat.pm.h
|
||||||
|
|
||||||
|
@ -26,7 +20,7 @@ xchat.pm.h: Xchat.pm IRC.pm
|
||||||
perl.exe generate_header
|
perl.exe generate_header
|
||||||
|
|
||||||
$(TARGET): perl.obj perl.def
|
$(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:
|
clean:
|
||||||
@del $(TARGET)
|
@del $(TARGET)
|
||||||
|
|
|
@ -3,12 +3,6 @@ include "..\..\src\makeinc.mak"
|
||||||
TARGET = xcperl-512.dll
|
TARGET = xcperl-512.dll
|
||||||
PERLLIB = perl512
|
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)
|
all: $(TARGET)
|
||||||
|
|
||||||
perl.def:
|
perl.def:
|
||||||
|
@ -18,7 +12,7 @@ perl.def:
|
||||||
echo xchat_plugin_get_info >> perl.def
|
echo xchat_plugin_get_info >> perl.def
|
||||||
|
|
||||||
perl.obj: perl.c
|
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
|
perl.c: xchat.pm.h
|
||||||
|
|
||||||
|
@ -26,7 +20,7 @@ xchat.pm.h: Xchat.pm IRC.pm
|
||||||
perl.exe generate_header
|
perl.exe generate_header
|
||||||
|
|
||||||
$(TARGET): perl.obj perl.def
|
$(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:
|
clean:
|
||||||
@del $(TARGET)
|
@del $(TARGET)
|
||||||
|
|
|
@ -19,6 +19,8 @@ CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 /I$(DEV64)\include
|
||||||
CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 /I$(DEV64)\include
|
CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 /I$(DEV64)\include
|
||||||
LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj
|
LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj
|
||||||
|
|
||||||
|
PERL510PATH = c:\mozilla-build\perl-5.10-x64\lib\CORE
|
||||||
|
PERL512PATH = c:\mozilla-build\perl-5.12-x64\lib\CORE
|
||||||
PYTHONPATH = c:\mozilla-build\python-2.6-x64
|
PYTHONPATH = c:\mozilla-build\python-2.6-x64
|
||||||
TCLPATH = c:\mozilla-build\tcl-8.5-x64
|
TCLPATH = c:\mozilla-build\tcl-8.5-x64
|
||||||
!else
|
!else
|
||||||
|
@ -32,6 +34,8 @@ LIBS = $(LIBS) /libpath:$(DEV32)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0
|
||||||
CFLAGS = $(CFLAGS) /I$(DEV32)\include
|
CFLAGS = $(CFLAGS) /I$(DEV32)\include
|
||||||
LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj
|
LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj
|
||||||
|
|
||||||
|
PERL510PATH = c:\mozilla-build\perl-5.10-x86\lib\CORE
|
||||||
|
PERL512PATH = c:\mozilla-build\perl-5.12-x86\lib\CORE
|
||||||
PYTHONPATH = c:\mozilla-build\python-2.6-x86
|
PYTHONPATH = c:\mozilla-build\python-2.6-x86
|
||||||
TCLPATH = c:\mozilla-build\tcl-8.5-x86
|
TCLPATH = c:\mozilla-build\tcl-8.5-x86
|
||||||
!endif
|
!endif
|
||||||
|
|
Loading…
Reference in New Issue