Skip to content

Commit 37aa87e

Browse files
K4sum1K4sum1
committed
manifest fix and mozconfig for branding and lto I guess
1 parent 2f17cf0 commit 37aa87e

File tree

3 files changed

+77
-27
lines changed

3 files changed

+77
-27
lines changed

‎browser/app/firefox.exe.manifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
4343
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
4444
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
45+
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
4546
</application>
4647
</compatibility>
4748
</assembly>

‎browser/app/r3dfox.exe.manifest

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
3+
<assemblyIdentity
4+
version="1.0.0.0"
5+
processorArchitecture="*"
6+
name="r3dfox"
7+
type="win32"
8+
/>
9+
<description>r3dfox</description>
10+
<dependency>
11+
<dependentAssembly>
12+
<assemblyIdentity
13+
type="win32"
14+
name="Microsoft.Windows.Common-Controls"
15+
version="6.0.0.0"
16+
processorArchitecture="*"
17+
publicKeyToken="6595b64144ccf1df"
18+
language="*"
19+
/>
20+
</dependentAssembly>
21+
</dependency>
22+
<dependency>
23+
<dependentAssembly>
24+
<assemblyIdentity
25+
type="win32"
26+
name="mozglue"
27+
version="1.0.0.0"
28+
language="*"
29+
/>
30+
</dependentAssembly>
31+
</dependency>
32+
<ms_asmv3:trustInfo xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
33+
<ms_asmv3:security>
34+
<ms_asmv3:requestedPrivileges>
35+
<ms_asmv3:requestedExecutionLevel level="asInvoker" uiAccess="false" />
36+
</ms_asmv3:requestedPrivileges>
37+
</ms_asmv3:security>
38+
</ms_asmv3:trustInfo>
39+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
40+
<application>
41+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
42+
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
43+
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
44+
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
45+
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
46+
</application>
47+
</compatibility>
48+
</assembly>

‎mozconfigs/mozconfig-win

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ ac_add_options --enable-clang-plugin
2727
ac_add_options --enable-lto=cross
2828
#ac_add_options --enable-profile-use=cross
2929
# Enable for normal
30-
#ac_add_options --enable-optimize="-O2 -O3 -Xclang -O3"
30+
ac_add_options --enable-optimize="-O2 -O3 -Xclang -O3"
3131
# Enable for SSE3
3232
#ac_add_options --enable-optimize="-O2 -O3 -msse3 -Xclang -O3"
3333
# Enable for SSE4
34-
ac_add_options --enable-optimize="-O2 -O3 -msse3 -mssse3 -msse4.1 -Xclang -O3"
34+
#ac_add_options --enable-optimize="-O2 -O3 -msse3 -mssse3 -msse4.1 -Xclang -O3"
3535
# Enable this first for AVX/2
3636
#ac_add_options --enable-wasm-avx
3737
# Enable for AVX
3838
#ac_add_options --enable-optimize="-O2 -O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -Xclang -O3"
3939
# Enable for AVX2
40-
ac_add_options --enable-optimize="-O2 -O3 -march=x86-64-v3 -Xclang -O3"
40+
#ac_add_options --enable-optimize="-O2 -O3 -march=x86-64-v3 -Xclang -O3"
4141
ac_add_options --enable-rust-simd
4242
ac_add_options --enable-hardening
4343
export MOZILLA_OFFICIAL=1
@@ -65,8 +65,8 @@ ac_add_options --disable-updater
6565
ac_add_options --disable-maintenance-service
6666
ac_add_options --without-wasm-sandboxed-libraries
6767
ac_add_options --disable-bits-download
68-
export MOZ_SOURCE_CHANGESET=${changeset}
69-
#export MOZ_SOURCE_CHANGESET=insertgoofyhere
68+
#export MOZ_SOURCE_CHANGESET=${changeset}
69+
export MOZ_SOURCE_CHANGESET=iloveneedingtobodgechangesetfornoreason
7070
mk_add_options MOZ_CRASHREPORTER=0
7171
mk_add_options MOZ_DATA_REPORTING=0
7272
mk_add_options MOZ_SERVICES_HEALTHREPORT=0
@@ -80,10 +80,10 @@ export MOZ_REQUIRE_SIGNING=
8080
export MOZ_TELEMETRY_REPORTING=
8181

8282
# Branding
83-
#ac_add_options --with-app-name=r3dfox
84-
#ac_add_options --with-app-basename=r3dfox
85-
#ac_add_options --with-branding=browser/branding/r3dfox
86-
#ac_add_options --with-distribution-id=com.eclipse.r3dfox
83+
ac_add_options --with-app-name=r3dfox
84+
ac_add_options --with-app-basename=r3dfox
85+
ac_add_options --with-branding=browser/branding/r3dfox
86+
ac_add_options --with-distribution-id=com.eclipse.r3dfox
8787

8888
# Plasmafox Branding
8989
#ac_add_options --with-app-name=Plasmafox
@@ -106,19 +106,20 @@ export RUSTC_OPT_LEVEL="3"
106106
ac_add_options RUSTC_OPT_LEVEL="3"
107107

108108
# Enable PGO/LTO
109-
#export MOZ_LTO=cross
110-
#ac_add_options MOZ_LTO=cross
111-
#export MOZ_PGO=1
112-
#ac_add_options MOZ_PGO=1
109+
export MOZ_LTO=cross
110+
ac_add_options MOZ_LTO=cross
111+
export MOZ_PGO=1
112+
ac_add_options MOZ_PGO=1
113113

114114
# Enable for normal
115115
# Compiler, Linker, and Rust flags
116-
#export CFLAGS="-O3 /clang:-O3"
117-
#export CPPFLAGS="-O3 /clang:-O3"
118-
#export CXXFLAGS="-O3 /clang:-O3"
119-
#export LDFLAGS="-Wl,-O3"
120-
#Uncomment below if building latest
116+
export CFLAGS="-O3 /clang:-O3"
117+
export CPPFLAGS="-O3 /clang:-O3"
118+
export CXXFLAGS="-O3 /clang:-O3"
119+
export LDFLAGS="-Wl,-O3"
121120
#export RUSTFLAGS="-C"
121+
#Comment above if building older? Why is the above borked in normal but fine in SSE4?
122+
122123

123124
# Enable for SSE3
124125
# Compiler, Linker, and Rust flags
@@ -127,18 +128,18 @@ ac_add_options RUSTC_OPT_LEVEL="3"
127128
#export CXXFLAGS="-O3 -msse3 /clang:-O3"
128129
#export LDFLAGS="-Wl,-O3 -msse3"
129130
#export RUSTFLAGS="target-feature=+sse3"
130-
#Comment above and uncomment below if building latest
131131
#export RUSTFLAGS="-C target-feature=+sse3"
132+
#Comment above if building older
132133

133134
# Enable for SSE4
134135
# Compiler, Linker, and Rust flags
135-
export CFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3"
136-
export CPPFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3"
137-
export CXXFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3"
138-
export LDFLAGS="-Wl,-O3 -msse3 -mssse3 -msse4.1"
136+
#export CFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3"
137+
#export CPPFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3"
138+
#export CXXFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3"
139+
#export LDFLAGS="-Wl,-O3 -msse3 -mssse3 -msse4.1"
139140
#export RUSTFLAGS=target-feature=+sse4.1"
140-
#Comment above and uncomment below if building latest
141-
export RUSTFLAGS="-C target-feature=+sse4.1"
141+
#export RUSTFLAGS="-C target-feature=+sse4.1"
142+
#Comment above if building older
142143

143144
# Enable for AVX
144145
# Compiler, Linker, and Rust flags
@@ -147,8 +148,8 @@ export RUSTFLAGS="-C target-feature=+sse4.1"
147148
#export CXXFLAGS="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch:AVX"
148149
#export LDFLAGS="-Wl,-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes"
149150
#export RUSTFLAGS="target-feature=+avx"
150-
#Comment above and uncomment below if building latest
151151
#export RUSTFLAGS="-C target-feature=+avx"
152+
#Comment above if building older
152153

153154
# Enable for AVX2
154155
# Compiler, Linker, and Rust flags
@@ -157,8 +158,8 @@ export RUSTFLAGS="-C target-feature=+sse4.1"
157158
#export CXXFLAGS="-O3 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:AVX2"
158159
#export LDFLAGS="-Wl,-O3 -march=x86-64-v3"
159160
#export RUSTFLAGS="target-feature=+avx2"
160-
#Comment above and uncomment below if building latest
161161
#export RUSTFLAGS="-C target-feature=+avx2"
162+
#Comment above if building older
162163

163164
POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
164165
export VERBOSE=1

0 commit comments

Comments
 (0)