moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/perl/makefile-510.mak
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)

10
plugins/perl/makefile-512.mak
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)

4
src/makeinc.skel
View File

@ -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