Fixed errors due to last sync.
This commit is contained in:
parent
8da4d20308
commit
fcf2b68e84
2 changed files with 2 additions and 2 deletions
|
|
@ -67,7 +67,7 @@ go_subdir_import.multicpptest:
|
||||||
mkdir -p testdir/go_subdir_import/
|
mkdir -p testdir/go_subdir_import/
|
||||||
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR="$(SRCDIR)" CXXSRCS="$(CXXSRCS)" \
|
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR="$(SRCDIR)" CXXSRCS="$(CXXSRCS)" \
|
||||||
SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
|
SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
|
||||||
INTERFACEPATH="go_subdir_import_b.i" \
|
INTERFACEPATH="$(SRCDIR)$(INTERFACEDIR)go_subdir_import_b.i" \
|
||||||
INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) -outdir ." NOLINK=true \
|
INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) -outdir ." NOLINK=true \
|
||||||
TARGET="$(TARGETPREFIX)go_subdir_import_b$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" \
|
TARGET="$(TARGETPREFIX)go_subdir_import_b$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" \
|
||||||
INTERFACE="testdir/go_subdir_import/go_subdir_import_b.i" \
|
INTERFACE="testdir/go_subdir_import/go_subdir_import_b.i" \
|
||||||
|
|
|
||||||
|
|
@ -444,7 +444,7 @@ private:
|
||||||
Delete(swig_input_content);
|
Delete(swig_input_content);
|
||||||
fclose(swig_input);
|
fclose(swig_input);
|
||||||
unique_id = NewString("");
|
unique_id = NewString("");
|
||||||
Printf(unique_id, "_%s_%08x%08x", package, hash.hi, hash.lo);
|
Printf(unique_id, "_%s_%08x%08x", getModuleName(package), hash.hi, hash.lo);
|
||||||
|
|
||||||
// Open files.
|
// Open files.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue