Skip to content

Commit 3da7f70

Browse files
utelleutelle
committed
Adjust build files
- Remove entry for not existing files from Visual Studio project files and from make files - Exclude PNG support from Zint if builtin version is used instead of system version in make file
1 parent 2fa18fd commit 3da7f70

11 files changed

+2
-44
lines changed

‎Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ ZINT_HDRS += \
123123
thirdparty/zint/backend/zfiletypes.h \
124124
thirdparty/zint/backend/zint.h \
125125
thirdparty/zint/backend/zintconfig.h
126-
ZINT_CFLAGS += -I$(top_srcdir)/thirdparty/zint/backend
127-
ZINT_CXXFLAGS += -I$(top_srcdir)/thirdparty/zint/backend
126+
ZINT_CFLAGS += -I$(top_srcdir)/thirdparty/zint/backend -DZINT_NO_PNG
127+
ZINT_CXXFLAGS += -I$(top_srcdir)/thirdparty/zint/backend -DZINT_NO_PNG
128128
endif
129129

130130
if HAVE_WOFF2

‎build/wxpdfdoc.make

-5
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ GENERATED += $(OBJDIR)/pdffontsubsetcff.o
239239
GENERATED += $(OBJDIR)/pdffontsubsettruetype.o
240240
GENERATED += $(OBJDIR)/pdffontvolt.o
241241
GENERATED += $(OBJDIR)/pdfform.o
242-
GENERATED += $(OBJDIR)/pdfgc.o
243242
GENERATED += $(OBJDIR)/pdfgradient.o
244243
GENERATED += $(OBJDIR)/pdfgraphics.o
245244
GENERATED += $(OBJDIR)/pdfimage.o
@@ -291,7 +290,6 @@ OBJECTS += $(OBJDIR)/pdffontsubsetcff.o
291290
OBJECTS += $(OBJDIR)/pdffontsubsettruetype.o
292291
OBJECTS += $(OBJDIR)/pdffontvolt.o
293292
OBJECTS += $(OBJDIR)/pdfform.o
294-
OBJECTS += $(OBJDIR)/pdfgc.o
295293
OBJECTS += $(OBJDIR)/pdfgradient.o
296294
OBJECTS += $(OBJDIR)/pdfgraphics.o
297295
OBJECTS += $(OBJDIR)/pdfimage.o
@@ -468,9 +466,6 @@ $(OBJDIR)/pdffontvolt.o: ../src/pdffontvolt.cpp
468466
$(OBJDIR)/pdfform.o: ../src/pdfform.cpp
469467
@echo "$(notdir $<)"
470468
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
471-
$(OBJDIR)/pdfgc.o: ../src/pdfgc.cpp
472-
@echo "$(notdir $<)"
473-
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
474469
$(OBJDIR)/pdfgradient.o: ../src/pdfgradient.cpp
475470
@echo "$(notdir $<)"
476471
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"

‎build/wxpdfdoc_mono.make

-5
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ GENERATED += $(OBJDIR)/pdffontsubsetcff.o
239239
GENERATED += $(OBJDIR)/pdffontsubsettruetype.o
240240
GENERATED += $(OBJDIR)/pdffontvolt.o
241241
GENERATED += $(OBJDIR)/pdfform.o
242-
GENERATED += $(OBJDIR)/pdfgc.o
243242
GENERATED += $(OBJDIR)/pdfgradient.o
244243
GENERATED += $(OBJDIR)/pdfgraphics.o
245244
GENERATED += $(OBJDIR)/pdfimage.o
@@ -291,7 +290,6 @@ OBJECTS += $(OBJDIR)/pdffontsubsetcff.o
291290
OBJECTS += $(OBJDIR)/pdffontsubsettruetype.o
292291
OBJECTS += $(OBJDIR)/pdffontvolt.o
293292
OBJECTS += $(OBJDIR)/pdfform.o
294-
OBJECTS += $(OBJDIR)/pdfgc.o
295293
OBJECTS += $(OBJDIR)/pdfgradient.o
296294
OBJECTS += $(OBJDIR)/pdfgraphics.o
297295
OBJECTS += $(OBJDIR)/pdfimage.o
@@ -468,9 +466,6 @@ $(OBJDIR)/pdffontvolt.o: ../src/pdffontvolt.cpp
468466
$(OBJDIR)/pdfform.o: ../src/pdfform.cpp
469467
@echo "$(notdir $<)"
470468
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
471-
$(OBJDIR)/pdfgc.o: ../src/pdfgc.cpp
472-
@echo "$(notdir $<)"
473-
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
474469
$(OBJDIR)/pdfgradient.o: ../src/pdfgradient.cpp
475470
@echo "$(notdir $<)"
476471
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"

‎build/wxpdfdoc_vc14_pdfdoc.vcxproj

-2
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,6 @@
617617
<ClInclude Include="..\include\wx\pdffontsubsettruetype.h" />
618618
<ClInclude Include="..\include\wx\pdffontvolt.h" />
619619
<ClInclude Include="..\include\wx\pdfform.h" />
620-
<ClInclude Include="..\include\wx\pdfgc.h" />
621620
<ClInclude Include="..\include\wx\pdfgradient.h" />
622621
<ClInclude Include="..\include\wx\pdfgraphics.h" />
623622
<ClInclude Include="..\include\wx\pdfimage.h" />
@@ -682,7 +681,6 @@
682681
<ClCompile Include="..\src\pdffontsubsettruetype.cpp" />
683682
<ClCompile Include="..\src\pdffontvolt.cpp" />
684683
<ClCompile Include="..\src\pdfform.cpp" />
685-
<ClCompile Include="..\src\pdfgc.cpp" />
686684
<ClCompile Include="..\src\pdfgradient.cpp" />
687685
<ClCompile Include="..\src\pdfgraphics.cpp" />
688686
<ClCompile Include="..\src\pdfimage.cpp" />

‎build/wxpdfdoc_vc14_pdfdoc.vcxproj.filters

-6
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@
123123
<ClInclude Include="..\include\wx\pdfform.h">
124124
<Filter>Header Files</Filter>
125125
</ClInclude>
126-
<ClInclude Include="..\include\wx\pdfgc.h">
127-
<Filter>Header Files</Filter>
128-
</ClInclude>
129126
<ClInclude Include="..\include\wx\pdfgradient.h">
130127
<Filter>Header Files</Filter>
131128
</ClInclude>
@@ -314,9 +311,6 @@
314311
<ClCompile Include="..\src\pdfform.cpp">
315312
<Filter>Source Files</Filter>
316313
</ClCompile>
317-
<ClCompile Include="..\src\pdfgc.cpp">
318-
<Filter>Source Files</Filter>
319-
</ClCompile>
320314
<ClCompile Include="..\src\pdfgradient.cpp">
321315
<Filter>Source Files</Filter>
322316
</ClCompile>

‎build/wxpdfdoc_vc15_pdfdoc.vcxproj

-2
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,6 @@
618618
<ClInclude Include="..\include\wx\pdffontsubsettruetype.h" />
619619
<ClInclude Include="..\include\wx\pdffontvolt.h" />
620620
<ClInclude Include="..\include\wx\pdfform.h" />
621-
<ClInclude Include="..\include\wx\pdfgc.h" />
622621
<ClInclude Include="..\include\wx\pdfgradient.h" />
623622
<ClInclude Include="..\include\wx\pdfgraphics.h" />
624623
<ClInclude Include="..\include\wx\pdfimage.h" />
@@ -683,7 +682,6 @@
683682
<ClCompile Include="..\src\pdffontsubsettruetype.cpp" />
684683
<ClCompile Include="..\src\pdffontvolt.cpp" />
685684
<ClCompile Include="..\src\pdfform.cpp" />
686-
<ClCompile Include="..\src\pdfgc.cpp" />
687685
<ClCompile Include="..\src\pdfgradient.cpp" />
688686
<ClCompile Include="..\src\pdfgraphics.cpp" />
689687
<ClCompile Include="..\src\pdfimage.cpp" />

‎build/wxpdfdoc_vc15_pdfdoc.vcxproj.filters

-6
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@
123123
<ClInclude Include="..\include\wx\pdfform.h">
124124
<Filter>Header Files</Filter>
125125
</ClInclude>
126-
<ClInclude Include="..\include\wx\pdfgc.h">
127-
<Filter>Header Files</Filter>
128-
</ClInclude>
129126
<ClInclude Include="..\include\wx\pdfgradient.h">
130127
<Filter>Header Files</Filter>
131128
</ClInclude>
@@ -314,9 +311,6 @@
314311
<ClCompile Include="..\src\pdfform.cpp">
315312
<Filter>Source Files</Filter>
316313
</ClCompile>
317-
<ClCompile Include="..\src\pdfgc.cpp">
318-
<Filter>Source Files</Filter>
319-
</ClCompile>
320314
<ClCompile Include="..\src\pdfgradient.cpp">
321315
<Filter>Source Files</Filter>
322316
</ClCompile>

‎build/wxpdfdoc_vc16_pdfdoc.vcxproj

-2
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,6 @@
629629
<ClInclude Include="..\include\wx\pdffontsubsettruetype.h" />
630630
<ClInclude Include="..\include\wx\pdffontvolt.h" />
631631
<ClInclude Include="..\include\wx\pdfform.h" />
632-
<ClInclude Include="..\include\wx\pdfgc.h" />
633632
<ClInclude Include="..\include\wx\pdfgradient.h" />
634633
<ClInclude Include="..\include\wx\pdfgraphics.h" />
635634
<ClInclude Include="..\include\wx\pdfimage.h" />
@@ -694,7 +693,6 @@
694693
<ClCompile Include="..\src\pdffontsubsettruetype.cpp" />
695694
<ClCompile Include="..\src\pdffontvolt.cpp" />
696695
<ClCompile Include="..\src\pdfform.cpp" />
697-
<ClCompile Include="..\src\pdfgc.cpp" />
698696
<ClCompile Include="..\src\pdfgradient.cpp" />
699697
<ClCompile Include="..\src\pdfgraphics.cpp" />
700698
<ClCompile Include="..\src\pdfimage.cpp" />

‎build/wxpdfdoc_vc16_pdfdoc.vcxproj.filters

-6
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@
123123
<ClInclude Include="..\include\wx\pdfform.h">
124124
<Filter>Header Files</Filter>
125125
</ClInclude>
126-
<ClInclude Include="..\include\wx\pdfgc.h">
127-
<Filter>Header Files</Filter>
128-
</ClInclude>
129126
<ClInclude Include="..\include\wx\pdfgradient.h">
130127
<Filter>Header Files</Filter>
131128
</ClInclude>
@@ -314,9 +311,6 @@
314311
<ClCompile Include="..\src\pdfform.cpp">
315312
<Filter>Source Files</Filter>
316313
</ClCompile>
317-
<ClCompile Include="..\src\pdfgc.cpp">
318-
<Filter>Source Files</Filter>
319-
</ClCompile>
320314
<ClCompile Include="..\src\pdfgradient.cpp">
321315
<Filter>Source Files</Filter>
322316
</ClCompile>

‎build/wxpdfdoc_vc17_pdfdoc.vcxproj

-2
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,6 @@
629629
<ClInclude Include="..\include\wx\pdffontsubsettruetype.h" />
630630
<ClInclude Include="..\include\wx\pdffontvolt.h" />
631631
<ClInclude Include="..\include\wx\pdfform.h" />
632-
<ClInclude Include="..\include\wx\pdfgc.h" />
633632
<ClInclude Include="..\include\wx\pdfgradient.h" />
634633
<ClInclude Include="..\include\wx\pdfgraphics.h" />
635634
<ClInclude Include="..\include\wx\pdfimage.h" />
@@ -694,7 +693,6 @@
694693
<ClCompile Include="..\src\pdffontsubsettruetype.cpp" />
695694
<ClCompile Include="..\src\pdffontvolt.cpp" />
696695
<ClCompile Include="..\src\pdfform.cpp" />
697-
<ClCompile Include="..\src\pdfgc.cpp" />
698696
<ClCompile Include="..\src\pdfgradient.cpp" />
699697
<ClCompile Include="..\src\pdfgraphics.cpp" />
700698
<ClCompile Include="..\src\pdfimage.cpp" />

‎build/wxpdfdoc_vc17_pdfdoc.vcxproj.filters

-6
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@
123123
<ClInclude Include="..\include\wx\pdfform.h">
124124
<Filter>Header Files</Filter>
125125
</ClInclude>
126-
<ClInclude Include="..\include\wx\pdfgc.h">
127-
<Filter>Header Files</Filter>
128-
</ClInclude>
129126
<ClInclude Include="..\include\wx\pdfgradient.h">
130127
<Filter>Header Files</Filter>
131128
</ClInclude>
@@ -314,9 +311,6 @@
314311
<ClCompile Include="..\src\pdfform.cpp">
315312
<Filter>Source Files</Filter>
316313
</ClCompile>
317-
<ClCompile Include="..\src\pdfgc.cpp">
318-
<Filter>Source Files</Filter>
319-
</ClCompile>
320314
<ClCompile Include="..\src\pdfgradient.cpp">
321315
<Filter>Source Files</Filter>
322316
</ClCompile>

0 commit comments

Comments
 (0)