ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/freexl/fix-makefiles.patch

   1 diff --git a/makefile.vc b/makefile.vc
   2 index 0aacbc7..d95d859 100644
   3 --- a/makefile.vc
   4 +++ b/makefile.vc
   5 @@ -7,7 +7,7 @@
   6  LIBOBJ                =        freexl.obj
   7  FREEXL_DLL                    =        freexl$(VERSION).dll
   8
   9 -CFLAGS =       /nologo -IC:\OSGeo4W\include -I. -Iheaders $(OPTFLAGS)
  10 +CFLAGS =       /nologo -I$(INSTALLED_ROOT)\include -I. -Iheaders $(OPTFLAGS)
  11
  12  default:       all
  13
  14 @@ -23,9 +23,9 @@ freexl.lib:   $(LIBOBJ)
  15  $(FREEXL_DLL): freexl_i.lib
  16
  17  freexl_i.lib:  $(LIBOBJ)
  18 -       link /debug /dll /out:$(FREEXL_DLL) \
  19 +       link $(LINK_FLAGS) /dll /out:$(FREEXL_DLL) \
  20                 /implib:freexl_i.lib $(LIBOBJ) \
  21 -               C:\OSGeo4w\lib\iconv.lib
  22 +               $(LIBS_ALL)
  23         if exist $(FREEXL_DLL).manifest mt -manifest \
  24                 $(FREEXL_DLL).manifest -outputresource:$(FREEXL_DLL);2
  25
  26 diff --git a/nmake.opt b/nmake.opt
  27 index 35f9242..efb6f77 100644
  28 --- a/nmake.opt
  29 +++ b/nmake.opt
  30 @@ -1,10 +1,10 @@
  31  # Directory tree where FreeXL will be installed.
  32 -INSTDIR=C:\OSGeo4W
  33 +INSTDIR=$(INST_DIR)
  34
  35  # Uncomment the first for an optimized build, or the second for debug.
  36 -OPTFLAGS=      /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \
  37 +OPTFLAGS=      /nologo /fp:precise /W3 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \
  38                         /DDLL_EXPORT
  39 -#OPTFLAGS=     /nologo /Zi /MD /Fdfreexl.pdb /DDLL_EXPORT
  40 +#OPTFLAGS=     /nologo $(CL_FLAGS) /Fdfreexl.pdb /DDLL_EXPORT
  41
  42  # Set the version number for the DLL.  Normally we leave this blank since
  43  # we want software that is dynamically loading the DLL to have no problem