diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-03 15:39:37 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-05 18:41:20 +0200 |
| commit | 412dd857b81471277e1014b6329f46a389a42cb3 (patch) | |
| tree | dd1c16b973f01be75b6184106e8a6e158b5286cf /qmake/Makefile.win32 | |
| parent | 52f3a7d9d40d3bf835bb0716ad201ee56731b980 (diff) | |
Compile QRegularExpression into qmake
This is required to be able to port qmake over to use
QRegularExpression instead of QRegExp.
Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 3430cf8c7f..52a7a607e6 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -32,17 +32,20 @@ CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \ $(CFLAGS_EXTRA) \ -I$(QMKSRC) -I$(QMKSRC)\library -I$(QMKSRC)\generators -I$(QMKSRC)\generators\unix -I$(QMKSRC)\generators\win32 -I$(QMKSRC)\generators\mac \ -I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \ + -I$(SOURCE_PATH)/src/3rdparty/pcre2/src \ -I$(INC_PATH) -I$(INC_PATH)\QtCore -I$(INC_PATH)\QtCore\$(QT_VERSION) -I$(INC_PATH)\QtCore\$(QT_VERSION)\QtCore \ -I$(BUILD_PATH)\src\corelib\global \ -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS \ -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ - -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DUNICODE -D_ENABLE_EXTENDED_ALIGNED_STORAGE -CFLAGS = $(CFLAGS_PCH) $(CFLAGS_BARE) $(CFLAGS) + -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DUNICODE -D_ENABLE_EXTENDED_ALIGNED_STORAGE \ + -DPCRE2_CODE_UNIT_WIDTH=16 -DHAVE_CONFIG_H -DPCRE2_STATIC + +CFLAGS = $(CFLAGS_BARE) $(CFLAGS) CXXFLAGS_BARE = $(CFLAGS_BARE) -CXXFLAGS = $(CFLAGS) +CXXFLAGS = $(CFLAGS) $(CFLAGS_PCH) LFLAGS = LIBS = ole32.lib advapi32.lib shell32.lib netapi32.lib @@ -125,7 +128,34 @@ QTOBJS= \ qjsonparser.obj \ qjsonarray.obj \ qjsonobject.obj \ - qjsonvalue.obj + qjsonvalue.obj \ + qregularexpression.obj \ + pcre2_auto_possess.obj \ + pcre2_chartables.obj \ + pcre2_compile.obj \ + pcre2_config.obj \ + pcre2_context.obj \ + pcre2_dfa_match.obj \ + pcre2_error.obj \ + pcre2_extuni.obj \ + pcre2_find_bracket.obj \ + pcre2_jit_compile.obj \ + pcre2_maketables.obj \ + pcre2_match.obj \ + pcre2_match_data.obj \ + pcre2_newline.obj \ + pcre2_ord2utf.obj \ + pcre2_pattern_info.obj \ + pcre2_script_run.obj \ + pcre2_serialize.obj \ + pcre2_string_utils.obj \ + pcre2_study.obj \ + pcre2_substitute.obj \ + pcre2_substring.obj \ + pcre2_tables.obj \ + pcre2_ucd.obj \ + pcre2_valid_utf.obj \ + pcre2_xclass.obj \ first all: $(BUILD_PATH)\bin\qmake.exe binary: $(BUILD_PATH)\qmake\qmake.exe @@ -211,6 +241,9 @@ qmake_pch.obj: {$(SOURCE_PATH)\src\corelib\tools}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< +{$(SOURCE_PATH)\src\3rdparty\pcre2\src}.c{}.obj:: + $(CXX) $(CFLAGS) $< + # Make sure qlibraryinfo.obj isn't compiled with PCH enabled qlibraryinfo.obj: $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp $(CXX) $(CXXFLAGS_BARE) -DQT_BUILD_QMAKE_BOOTSTRAP $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp |