P35124786
/
notepad--
mirror of https://gitee.com/cxasm/notepad--.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!2 fix compile error: g++: fatal error: cannot specify -o with -c, -S or -E with multiple files 

Merge pull request !2 from wingrez/master
This commit is contained in:
爬山虎 2022-11-14 12:08:16 +00:00 committed by Gitee
parent d07e15b634 687e8b4035
commit b89fb6cc15
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qscint/src/qscintilla.pro
View File

@ -117,7 +117,7 @@ HEADERS = \
./Qsci/qscilexeredifact.h \ ./Qsci/qscilexeredifact.h \
./Qsci/qscilexerfortran.h \ ./Qsci/qscilexerfortran.h \
./Qsci/qscilexerfortran77.h \ ./Qsci/qscilexerfortran77.h \
./Qsci/qscilexergo.h \ ./Qsci/qscilexergo.h \
./Qsci/qscilexertext.h \ ./Qsci/qscilexertext.h \
./Qsci/qscilexerhtml.h \ ./Qsci/qscilexerhtml.h \
./Qsci/qscilexeridl.h \ ./Qsci/qscilexeridl.h \
@ -214,7 +214,8 @@ HEADERS = \
../scintilla/src/UniqueString.h \ ../scintilla/src/UniqueString.h \
../scintilla/src/ViewStyle.h \ ../scintilla/src/ViewStyle.h \
../scintilla/src/XPM.h \ ../scintilla/src/XPM.h \
../scintilla/boostregex/*.h ../scintilla/boostregex/AnsiDocumentIterator.h \
../scintilla/boostregex/UTF8DocumentIterator.h
!ios:HEADERS += ./Qsci/qsciprinter.h !ios:HEADERS += ./Qsci/qsciprinter.h
@ -243,7 +244,7 @@ SOURCES = \
qscilexeredifact.cpp \ qscilexeredifact.cpp \
qscilexerfortran.cpp \ qscilexerfortran.cpp \
qscilexerfortran77.cpp \ qscilexerfortran77.cpp \
qscilexergo.cpp \ qscilexergo.cpp \
qscilexertext.cpp \ qscilexertext.cpp \
qscilexerhtml.cpp \ qscilexerhtml.cpp \
qscilexeridl.cpp \ qscilexeridl.cpp \
@ -431,7 +432,9 @@ SOURCES = \
../scintilla/src/UniConversion.cpp \ ../scintilla/src/UniConversion.cpp \
../scintilla/src/ViewStyle.cpp \ ../scintilla/src/ViewStyle.cpp \
../scintilla/src/XPM.cpp \ ../scintilla/src/XPM.cpp \
../scintilla/boostregex/*.cpp ../scintilla/boostregex/BoostRegExSearch.cpp \
../scintilla/boostregex/UTF8DocumentIterator.cpp
INCLUDEPATH += ../scintilla/boostregex INCLUDEPATH += ../scintilla/boostregex