Skip to content

Commit 60b203c

Browse files
committed
3f9dc45: samples: use the same build options as DNG uses by default
1 parent 2c7b86e commit 60b203c

4 files changed

Lines changed: 15 additions & 7 deletions

File tree

prog/samples/physTest/jamfile-phys-test

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ UseD3DMulti = yes ;
33
UseD3DMultiList = DX11 vulkan Metal ;
44
if $(Headless) = yes { UseD3DMultiList = stub ; }
55

6-
PlatformArch_windows ?= host_arch ;
7-
PlatformSpec_windows ?= clang ;
8-
include $(Root)/prog/_jBuild/defPlatform.jam ;
6+
include $(Root)/prog/samples/samples_setup.jam ;
97

108
TargetType = exe ;
119
Target = samples/physTest$(PhysEngine)-$(Platform)-$(PlatformArch) ;

prog/samples/samples_setup.jam

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
PlatformArch_windows ?= host_arch ;
2+
PlatformSpec_windows ?= clang ;
3+
CheckedContainers ?= yes ;
4+
Exceptions ?= no ;
5+
6+
include $(Root)/prog/_jBuild/defPlatform.jam ;
7+
8+
if $(Platform)-$(PlatformArch) != windows-x86 { SSEVersion ?= 4 ; }
9+
if $(Platform)-$(PlatformArch) = linux-x86_64 {
10+
MArch ?= haswell ;
11+
if $(MArch) != -default- && ! -march=$(MArch) in $(GlobalCPPopt) { GlobalCPPopt += -march=$(MArch) ; }
12+
}

samples/skiesSample/prog/jamfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Root ?= ../../.. ;
22
Location = samples/skiesSample/prog ;
33
UseD3DMulti ?= yes ;
44

5-
PlatformArch_windows ?= host_arch ;
6-
PlatformSpec_windows ?= clang ;
5+
include $(Root)/prog/samples/samples_setup.jam ;
76

87
include $(Root)/prog/_jBuild/defaults.jam ;
98

samples/testGI/prog/jamfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Root ?= ../../.. ;
22
Location = samples/testGI/prog ;
33
UseD3DMulti ?= yes ;
44

5-
PlatformArch_windows ?= host_arch ;
6-
PlatformSpec_windows ?= clang ;
5+
include $(Root)/prog/samples/samples_setup.jam ;
76

87
include $(Root)/prog/_jBuild/defaults.jam ;
98

0 commit comments

Comments
 (0)