Skip to content

C
core
Kaydet (Commit) 8e3ef76c authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

bah, three-way merge screwed us

üst d88ba9af
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
l10ntools/source/makefile.mk
Dosyayı görüntüle @ 8e3ef76c
...@@ -79,6 +79,7 @@ APP1STDLIBS+= \ ...@@ -79,6 +79,7 @@ APP1STDLIBS+= \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(SALLIB) $(SALLIB)
APP1LIBS+= $(LB)$/$(TARGET).lib APP1LIBS+= $(LB)$/$(TARGET).lib
APP1DEPN= $(OBJ)$/src_yy_wrapper.obj $(LB)$/$(TARGET).lib APP1DEPN= $(OBJ)$/src_yy_wrapper.obj $(LB)$/$(TARGET).lib
...@@ -90,14 +91,12 @@ APP2STDLIBS+= \ ...@@ -90,14 +91,12 @@ APP2STDLIBS+= \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(SALLIB) $(SALLIB)
$(COMPHELPERLIB)
# extractor and merger for *.lng and *.lng # extractor and merger for *.lng and *.lng
APP3TARGET= ulfex APP3TARGET= ulfex
APP3OBJS= $(OBJ)$/lngmerge.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj APP3OBJS= $(OBJ)$/lngmerge.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj
APP3RPATH= NONE APP3RPATH= NONE
APP3STDLIBS+= \ APP3STDLIBS+= \
$(COMPHELPERLIB) \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(SALLIB) $(SALLIB)
...@@ -114,7 +113,6 @@ APP5STDLIBS+= \ ...@@ -114,7 +113,6 @@ APP5STDLIBS+= \
APP6TARGET= cfgex APP6TARGET= cfgex
APP6OBJS= $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj APP6OBJS= $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj
APP6STDLIBS+= \ APP6STDLIBS+= \
$(COMPHELPERLIB) \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(SALLIB) $(SALLIB)
...@@ -124,7 +122,6 @@ APP7TARGET= xrmex ...@@ -124,7 +122,6 @@ APP7TARGET= xrmex
APP7OBJS= $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj APP7OBJS= $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj
APP7RPATH= NONE APP7RPATH= NONE
APP7STDLIBS+= \ APP7STDLIBS+= \
$(COMPHELPERLIB) \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(SALLIB) $(SALLIB)
...@@ -136,7 +133,6 @@ EXCEPTIONSFILES= \ ...@@ -136,7 +133,6 @@ EXCEPTIONSFILES= \
APP9OBJS= $(OBJ)$/localize.obj $(OBJ)$/srciter.obj $(OBJ)$/export2.obj $(OBJ)$/file.obj $(OBJ)$/directory.obj APP9OBJS= $(OBJ)$/localize.obj $(OBJ)$/srciter.obj $(OBJ)$/export2.obj $(OBJ)$/file.obj $(OBJ)$/directory.obj
APP9STDLIBS+= \ APP9STDLIBS+= \
$(COMPHELPERLIB) \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(ICUINLIB) \ $(ICUINLIB) \
......
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