Skip to content

Commit 144f086

Browse files
utelleutelle
committed
Fix issue #96
Adjusted make files to properly handle white space in path names
1 parent 3da7f70 commit 144f086

19 files changed

+92
-63
lines changed

‎CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and from version 0.9.0 onwards this project adheres to [Semantic Versioning](htt
77

88
## [Unreleased]
99

10+
## [1.3.1] - 2025-04-28
11+
12+
### Fixed
13+
14+
- Adjusted make files to properly handle white space in path names (issue #96)
15+
1016
## [1.3.0] - 2025-02-12
1117

1218
### Added
@@ -522,7 +528,8 @@ First public release
522528

523529
- Planning and basic PDF features implemented
524530

525-
[Unreleased]: ../../compare/v1.3.0...HEAD
531+
[Unreleased]: ../../compare/v1.3.1...HEAD
532+
[1.3.1]: ../../compare/v1.3.0...v1.3.1
526533
[1.3.0]: ../../compare/v1.2.1...v1.3.0
527534
[1.2.1]: ../../compare/v1.2.0...v1.2.1
528535
[1.2.0]: ../../compare/v1.1.0...v1.2.0

‎build/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make workspace makefile autogenerated by Premake
1+
# GNU Make workspace makefile autogenerated by Premake
22

33
include config.gcc
44

‎build/dcsample.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/dcsample_mono.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/libwoff2.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/libzint.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/makefont.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/makefont_mono.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/minimal.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/minimal_mono.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/showfont.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/showfont_mono.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32

‎build/wxpdfdoc.make

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alternative GNU Make project makefile autogenerated by Premake
1+
# GNU Make project makefile autogenerated by Premake
22

33
ifndef config
44
config=debug_win32
@@ -100,8 +100,8 @@ DEFINES += -D_WINDOWS -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CR
100100
INCLUDES += -I"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll/msw$(wxSuffix)" -I"$(wxRootDir)/include" -I../include -I../thirdparty/woff2/include -I../thirdparty/zint/backend/fonts -I../thirdparty/zint/backend
101101
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g
102102
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -std=c++11
103-
LIBS += lib/$(wxCompilerPrefix)/Win32/Debug wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Debug wxDLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
104-
LDDEPS += lib/$(wxCompilerPrefix)/Win32/Debug\ wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Debug\ wxDLL/libzint.lib
103+
LIBS += lib/$(wxCompilerPrefix)/Win32/Debug_wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Debug_wxDLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
104+
LDDEPS += lib/$(wxCompilerPrefix)/Win32/Debug_wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Debug_wxDLL/libzint.lib
105105
ALL_LDFLAGS += $(LDFLAGS) -L"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll" -L/usr/lib32 -m32
106106
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
107107

@@ -113,8 +113,8 @@ DEFINES += -D_WINDOWS -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CR
113113
INCLUDES += -I"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll/msw$(wxSuffix)" -I"$(wxRootDir)/include" -I../include -I../thirdparty/woff2/include -I../thirdparty/zint/backend/fonts -I../thirdparty/zint/backend
114114
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g
115115
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -std=c++11
116-
LIBS += lib/$(wxCompilerPrefix)/Win64/Debug wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Debug wxDLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
117-
LDDEPS += lib/$(wxCompilerPrefix)/Win64/Debug\ wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Debug\ wxDLL/libzint.lib
116+
LIBS += lib/$(wxCompilerPrefix)/Win64/Debug_wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Debug_wxDLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
117+
LDDEPS += lib/$(wxCompilerPrefix)/Win64/Debug_wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Debug_wxDLL/libzint.lib
118118
ALL_LDFLAGS += $(LDFLAGS) -L"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll" -L/usr/lib64 -m64
119119
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
120120

@@ -126,8 +126,8 @@ DEFINES += -D_WINDOWS -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CR
126126
INCLUDES += -I"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll/msw$(wxSuffix)" -I"$(wxRootDir)/include" -I../include -I../thirdparty/woff2/include -I../thirdparty/zint/backend/fonts -I../thirdparty/zint/backend
127127
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2
128128
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -std=c++11
129-
LIBS += lib/$(wxCompilerPrefix)/Win32/Release wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Release wxDLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
130-
LDDEPS += lib/$(wxCompilerPrefix)/Win32/Release\ wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Release\ wxDLL/libzint.lib
129+
LIBS += lib/$(wxCompilerPrefix)/Win32/Release_wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Release_wxDLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
130+
LDDEPS += lib/$(wxCompilerPrefix)/Win32/Release_wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Release_wxDLL/libzint.lib
131131
ALL_LDFLAGS += $(LDFLAGS) -L"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll" -L/usr/lib32 -m32 -s
132132
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
133133

@@ -139,8 +139,8 @@ DEFINES += -D_WINDOWS -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CR
139139
INCLUDES += -I"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll/msw$(wxSuffix)" -I"$(wxRootDir)/include" -I../include -I../thirdparty/woff2/include -I../thirdparty/zint/backend/fonts -I../thirdparty/zint/backend
140140
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2
141141
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c++11
142-
LIBS += lib/$(wxCompilerPrefix)/Win64/Release wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Release wxDLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
143-
LDDEPS += lib/$(wxCompilerPrefix)/Win64/Release\ wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Release\ wxDLL/libzint.lib
142+
LIBS += lib/$(wxCompilerPrefix)/Win64/Release_wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Release_wxDLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
143+
LDDEPS += lib/$(wxCompilerPrefix)/Win64/Release_wxDLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Release_wxDLL/libzint.lib
144144
ALL_LDFLAGS += $(LDFLAGS) -L"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll" -L/usr/lib64 -m64 -s
145145
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
146146

@@ -152,8 +152,8 @@ DEFINES += -D_WINDOWS -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CR
152152
INCLUDES += -I"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll/msw$(wxSuffix)" -I"$(wxRootDir)/include" -I../include -I../thirdparty/woff2/include -I../thirdparty/zint/backend/fonts -I../thirdparty/zint/backend
153153
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g
154154
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -std=c++11
155-
LIBS += lib/$(wxCompilerPrefix)/Win32/Debug DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Debug DLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
156-
LDDEPS += lib/$(wxCompilerPrefix)/Win32/Debug\ DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Debug\ DLL/libzint.lib
155+
LIBS += lib/$(wxCompilerPrefix)/Win32/Debug_DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Debug_DLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
156+
LDDEPS += lib/$(wxCompilerPrefix)/Win32/Debug_DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Debug_DLL/libzint.lib
157157
ALL_LDFLAGS += $(LDFLAGS) -L"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll" -L/usr/lib32 -m32 -shared -Wl,--out-implib="../lib/gcc_dll/libwxpdfdoc$(wxFlavour)d.a"
158158
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
159159

@@ -165,8 +165,8 @@ DEFINES += -D_WINDOWS -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CR
165165
INCLUDES += -I"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll/msw$(wxSuffix)" -I"$(wxRootDir)/include" -I../include -I../thirdparty/woff2/include -I../thirdparty/zint/backend/fonts -I../thirdparty/zint/backend
166166
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g
167167
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -std=c++11
168-
LIBS += lib/$(wxCompilerPrefix)/Win64/Debug DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Debug DLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
169-
LDDEPS += lib/$(wxCompilerPrefix)/Win64/Debug\ DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Debug\ DLL/libzint.lib
168+
LIBS += lib/$(wxCompilerPrefix)/Win64/Debug_DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Debug_DLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
169+
LDDEPS += lib/$(wxCompilerPrefix)/Win64/Debug_DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Debug_DLL/libzint.lib
170170
ALL_LDFLAGS += $(LDFLAGS) -L"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll" -L/usr/lib64 -m64 -shared -Wl,--out-implib="../lib/gcc_x64_dll/libwxpdfdoc$(wxFlavour)d.a"
171171
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
172172

@@ -178,8 +178,8 @@ DEFINES += -D_WINDOWS -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CR
178178
INCLUDES += -I"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll/msw$(wxSuffix)" -I"$(wxRootDir)/include" -I../include -I../thirdparty/woff2/include -I../thirdparty/zint/backend/fonts -I../thirdparty/zint/backend
179179
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2
180180
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -std=c++11
181-
LIBS += lib/$(wxCompilerPrefix)/Win32/Release DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Release DLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
182-
LDDEPS += lib/$(wxCompilerPrefix)/Win32/Release\ DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Release\ DLL/libzint.lib
181+
LIBS += lib/$(wxCompilerPrefix)/Win32/Release_DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Release_DLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
182+
LDDEPS += lib/$(wxCompilerPrefix)/Win32/Release_DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win32/Release_DLL/libzint.lib
183183
ALL_LDFLAGS += $(LDFLAGS) -L"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll" -L/usr/lib32 -m32 -shared -Wl,--out-implib="../lib/gcc_dll/libwxpdfdoc$(wxFlavour).a" -s
184184
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
185185

@@ -191,8 +191,8 @@ DEFINES += -D_WINDOWS -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CR
191191
INCLUDES += -I"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll/msw$(wxSuffix)" -I"$(wxRootDir)/include" -I../include -I../thirdparty/woff2/include -I../thirdparty/zint/backend/fonts -I../thirdparty/zint/backend
192192
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2
193193
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c++11
194-
LIBS += lib/$(wxCompilerPrefix)/Win64/Release DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Release DLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
195-
LDDEPS += lib/$(wxCompilerPrefix)/Win64/Release\ DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Release\ DLL/libzint.lib
194+
LIBS += lib/$(wxCompilerPrefix)/Win64/Release_DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Release_DLL/libzint.lib -l$(wxToolkitLibNamePrefix)core -l$(wxBaseLibNamePrefix)_xml -l$(wxBaseLibNamePrefix) -lwxjpeg$(wxSuffixDebug) -lwxpng$(wxSuffixDebug) -lwxzlib$(wxSuffixDebug) -lwxtiff$(wxSuffixDebug) -lwxexpat$(wxSuffixDebug) -lwxregex$(wxSuffix) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
195+
LDDEPS += lib/$(wxCompilerPrefix)/Win64/Release_DLL/libwoff2.lib lib/$(wxCompilerPrefix)/Win64/Release_DLL/libzint.lib
196196
ALL_LDFLAGS += $(LDFLAGS) -L"$(wxRootDir)/lib/$(wxCompilerPrefix)$(wxArchSuffix)_dll" -L/usr/lib64 -m64 -shared -Wl,--out-implib="../lib/gcc_x64_dll/libwxpdfdoc$(wxFlavour).a" -s
197197
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
198198

0 commit comments

Comments
 (0)