Kaydet (Commit) 55823d33 authored tarafından David Tardon's avatar David Tardon

replace APP?RPATH SDK by SDKBIN in old build system

Commit 0c80ad06 broke MacOS X builds
because of this discrepancy. It would be easy to accept both, but I
think it is better to be consistent with gbuild.
üst 5d66587d
...@@ -72,7 +72,7 @@ APP1TARGET= $(TARGET) ...@@ -72,7 +72,7 @@ APP1TARGET= $(TARGET)
APP1STACK= 1000000 APP1STACK= 1000000
APP1OBJS= $(OBJ)$/main.obj APP1OBJS= $(OBJ)$/main.obj
APP1RPATH=SDK APP1RPATH=SDKBIN
.IF "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT"
APP1STDLIBS= $(COSVLIB) $(UDMLIB) APP1STDLIBS= $(COSVLIB) $(UDMLIB)
......
...@@ -64,7 +64,7 @@ NOOPTFILES= \ ...@@ -64,7 +64,7 @@ NOOPTFILES= \
$(OBJ)$/cpputype.obj $(OBJ)$/cpputype.obj
APP1TARGET= $(TARGET) APP1TARGET= $(TARGET)
APP1RPATH=SDK APP1RPATH=SDKBIN
APP1OBJS= $(OBJFILES) APP1OBJS= $(OBJFILES)
APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONCPPLIBDEPN) APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONCPPLIBDEPN)
......
...@@ -56,7 +56,7 @@ OBJFILES = \ ...@@ -56,7 +56,7 @@ OBJFILES = \
$(OBJ)$/javatype.obj $(OBJ)$/javatype.obj
APP1TARGET= $(TARGET) APP1TARGET= $(TARGET)
APP1RPATH=SDK APP1RPATH=SDKBIN
APP1OBJS = $(OBJFILES) APP1OBJS = $(OBJFILES)
APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONJAVALIBDEPN) APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONJAVALIBDEPN)
......
...@@ -62,7 +62,7 @@ APP2STDLIBS=\ ...@@ -62,7 +62,7 @@ APP2STDLIBS=\
APP3TARGET= regcompare APP3TARGET= regcompare
APP3OBJS= $(OBJ)$/regcompare.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj APP3OBJS= $(OBJ)$/regcompare.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj
APP3RPATH= SDK APP3RPATH= SDKBIN
APP3STDLIBS=\ APP3STDLIBS=\
$(SALLIB) \ $(SALLIB) \
......
...@@ -71,7 +71,7 @@ sub action($$$) ...@@ -71,7 +71,7 @@ sub action($$$)
return $act; return $act;
} }
@ARGV >= 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDK|OXT|NONE <filepath>*'; @ARGV >= 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDKBIN|OXT|NONE <filepath>*';
$type = shift @ARGV; $type = shift @ARGV;
$loc = shift @ARGV; $loc = shift @ARGV;
if ($type eq "Executable") if ($type eq "Executable")
......
...@@ -44,7 +44,7 @@ all: ...@@ -44,7 +44,7 @@ all:
.INCLUDE : $(PRJ)$/unodevtools.pmk .INCLUDE : $(PRJ)$/unodevtools.pmk
APP1TARGET = $(TARGET) APP1TARGET = $(TARGET)
APP1RPATH=SDK APP1RPATH=SDKBIN
APP1OBJS = $(OBJ)$/skeletonmaker.obj \ APP1OBJS = $(OBJ)$/skeletonmaker.obj \
$(OBJ)$/skeletoncommon.obj \ $(OBJ)$/skeletoncommon.obj \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment