Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings
This repository was archived by the owner on Mar 4, 2023. It is now read-only.
/QtDataSyncPublic archive

Commit119ee88

Browse files
committed
simplify and correct masm arch detection
1 parent2f88d3a commit119ee88

File tree

2 files changed

+13
-22
lines changed

2 files changed

+13
-22
lines changed

‎mkspecs/features/masm.prf

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
contains(QT_ARCH, x86_64) {
2-
isEmpty(QMAKE_MASM64_COMPILER):QMAKE_MASM64_COMPILER = ml64.exe
3-
isEmpty(QMAKE_MASM_COMPILER): QMAKE_MASM_COMPILER =$$QMAKE_MASM64_COMPILER
1+
isEmpty(QMAKE_MASM_COMPILER) {
2+
contains(QT_ARCH, x86_64):QMAKE_MASM_COMPILER = ml64.exe
3+
else: QMAKE_MASM_COMPILER =ml.exe
44
}
55

6-
isEmpty(QMAKE_MASM_COMPILER): QMAKE_MASM_COMPILER = ml.exe
7-
8-
isEmpty(QMAKE_MASM_COMMON_FLAGS): QMAKE_MASM_COMMON_FLAGS = /c /nologo /W3 /Cx /Zi
9-
isEmpty(QMAKE_MASM_FLAGS): QMAKE_MASM_FLAGS = /D_M_X86 /safeseh
10-
isEmpty(QMAKE_MASM64_FLAGS): QMAKE_MASM64_FLAGS = /D_M_X64
6+
contains(QT_ARCH, x86_64): QMAKE_MASM_FLAGS = /D_M_X64
7+
else: QMAKE_MASM_FLAGS = /D_M_X86 /safeseh
8+
QMAKE_MASM_FLAGS += /c /nologo /W3 /Cx /Zi
119

1210
isEmpty(MASM_DIR): MASM_DIR = .
1311
debug_and_release {
@@ -18,20 +16,11 @@ debug_and_release {
1816
masm_c.name = QMAKE_MASM_COMPILER ${QMAKE_FILE_IN}
1917
masm_c.input = MASM_SOURCES
2018
masm_c.variable_out = OBJECTS
21-
masm_c.commands = $$QMAKE_MASM_COMPILER $$QMAKE_MASM_COMMON_FLAGS $$QMAKE_MASM_FLAGS /Fo${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
19+
masm_c.commands = $$QMAKE_MASM_COMPILER $$QMAKE_MASM_FLAGS /Fo${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
2220
masm_c.output = $$MASM_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
2321
#masm_c.depends += $$QMAKE_MASM_COMPILER
2422
masm_c.dependency_type = TYPE_C
2523
QMAKE_EXTRA_COMPILERS += masm_c
2624

27-
masm64_c.name = QMAKE_MASM64_COMPILER ${QMAKE_FILE_IN}
28-
masm64_c.input = MASM_x64_SOURCES
29-
masm64_c.variable_out = OBJECTS
30-
masm64_c.commands = $$QMAKE_MASM64_COMPILER $$QMAKE_MASM_COMMON_FLAGS $$QMAKE_MASM64_FLAGS /Fo${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
31-
masm64_c.output = $$MASM_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
32-
#masm64_c.depends += $$QMAKE_MASM64_COMPILER
33-
masm64_c.dependency_type = TYPE_C
34-
contains(QT_ARCH, x86_64): QMAKE_EXTRA_COMPILERS += masm64_c
35-
3625
QMAKE_DIR_REPLACE += MASM_DIR
3726
QMAKE_DIR_REPLACE_SANE += MASM_DIR

‎src/3rdparty/cryptopp/cryptopp.pro

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,15 @@ sse4_2 {
392392

393393
win32 {
394394
CONFIG += masm
395-
395+
396396
MASM_SOURCES +=\
397397
src/rdrand.asm
398398

399-
MASM_x64_SOURCES +=\
400-
src/x64masm.asm\
401-
src/x64dll.asm
399+
contains(QT_ARCH, x86_64) {
400+
MASM_SOURCES +=\
401+
src/x64masm.asm\
402+
src/x64dll.asm
403+
}
402404
} else:!isEmpty(ANDROID_TARGET_ARCH) {
403405
INCLUDEPATH += $$(ANDROID_NDK_ROOT)/sources/android/cpufeatures
404406
SOURCES += $$(ANDROID_NDK_ROOT)/sources/android/cpufeatures/cpu-features.c

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp