diff options
| author | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-11-12 04:11:27 +0100 |
|---|---|---|
| committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-11-12 04:11:27 +0100 |
| commit | f98ac35d9ee1b86245efe70b8161724be1af16ea (patch) | |
| tree | 6193e2ca9d5c6a8ccfe8c92bde992046a0dc9bf0 | |
| parent | 9cbe171fd9e1634ea91423d9f52b299705ee98d7 (diff) | |
restrict use of absolute paths as much as possible
| -rw-r--r-- | plugins/perl/makefile-510.mak | 10 | ||||
| -rw-r--r-- | plugins/perl/makefile-512.mak | 10 | ||||
| -rw-r--r-- | src/makeinc.skel | 4 |
3 files changed, 8 insertions, 16 deletions
diff --git a/plugins/perl/makefile-510.mak b/plugins/perl/makefile-510.mak index f407eadb..a91587d2 100644 --- a/plugins/perl/makefile-510.mak +++ b/plugins/perl/makefile-510.mak @@ -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) diff --git a/plugins/perl/makefile-512.mak b/plugins/perl/makefile-512.mak index 523c1dcf..2ef298d8 100644 --- a/plugins/perl/makefile-512.mak +++ b/plugins/perl/makefile-512.mak @@ -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) diff --git a/src/makeinc.skel b/src/makeinc.skel index 3ad4998a..8097d6d4 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -19,6 +19,8 @@ CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 /I$(DEV64)\include CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 /I$(DEV64)\include 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 TCLPATH = c:\mozilla-build\tcl-8.5-x64 !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 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 TCLPATH = c:\mozilla-build\tcl-8.5-x86 !endif |