From 3ac78c85a86ecc12abbbd487fea426af0fcd69b6 Mon Sep 17 00:00:00 2001 From: winmad Date: Wed, 4 Nov 2015 20:28:49 -0800 Subject: [PATCH] compiled on Windows --- .gitignore | 17 +++++++++++++++++ renderer/common/image/image.vcxproj | 10 +++++++++- renderer/common/lexers/lexers.vcxproj | 10 +++++++++- renderer/common/sys/sys.vcxproj | 10 +++++++++- renderer/devices/device/device.vcxproj | 10 +++++++++- .../device_network/network_device.vcxproj | 10 +++++++++- .../device_network/network_server.vcxproj | 10 +++++++++- .../device_singleray/device_singleray.vcxproj | 10 +++++++++- renderer/devices/renderer/renderer.vcxproj | 10 +++++++++- renderer/models/conference/conference.ecs | 4 ++-- 10 files changed, 91 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 96374c4..4b44a66 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,20 @@ +*.tga +*.pfm +*.vcxproj +*.user +*.sdf +*.suo +*.opensdf +renderer/common/image/x64 +renderer/common/lexers/x64 +renderer/common/sys/x64 +renderer/devices/device/x64 +renderer/devices/device_network/x64 +renderer/devices/device_singleray/x64 +renderer/devices/renderer/x64 +renderer/ipch +renderer/x64 + # Windows image file caches Thumbs.db ehthumbs.db diff --git a/renderer/common/image/image.vcxproj b/renderer/common/image/image.vcxproj index 4439ffb..d3a6223 100644 --- a/renderer/common/image/image.vcxproj +++ b/renderer/common/image/image.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -44,39 +44,47 @@ StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte + v120 diff --git a/renderer/common/lexers/lexers.vcxproj b/renderer/common/lexers/lexers.vcxproj index 2e4ace6..5b06acb 100644 --- a/renderer/common/lexers/lexers.vcxproj +++ b/renderer/common/lexers/lexers.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -44,39 +44,47 @@ StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte + v120 diff --git a/renderer/common/sys/sys.vcxproj b/renderer/common/sys/sys.vcxproj index cc37287..2d56734 100644 --- a/renderer/common/sys/sys.vcxproj +++ b/renderer/common/sys/sys.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -44,39 +44,47 @@ StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte true + v120 StaticLibrary MultiByte + v120 diff --git a/renderer/devices/device/device.vcxproj b/renderer/devices/device/device.vcxproj index c9cc338..9e23380 100644 --- a/renderer/devices/device/device.vcxproj +++ b/renderer/devices/device/device.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -44,39 +44,47 @@ StaticLibrary NotSet true + v120 StaticLibrary NotSet true + v120 StaticLibrary NotSet true + v120 StaticLibrary NotSet + v120 StaticLibrary NotSet true + v120 StaticLibrary NotSet true + v120 StaticLibrary NotSet true + v120 StaticLibrary NotSet + v120 diff --git a/renderer/devices/device_network/network_device.vcxproj b/renderer/devices/device_network/network_device.vcxproj index 3085612..f306907 100644 --- a/renderer/devices/device_network/network_device.vcxproj +++ b/renderer/devices/device_network/network_device.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -45,39 +45,47 @@ DynamicLibrary NotSet true + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet + v120 diff --git a/renderer/devices/device_network/network_server.vcxproj b/renderer/devices/device_network/network_server.vcxproj index 0a4fd6b..a473f87 100644 --- a/renderer/devices/device_network/network_server.vcxproj +++ b/renderer/devices/device_network/network_server.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -45,39 +45,47 @@ Application NotSet true + v120 Application NotSet true + v120 Application NotSet true + v120 Application NotSet + v120 Application NotSet true + v120 Application NotSet true + v120 Application NotSet true + v120 Application NotSet + v120 diff --git a/renderer/devices/device_singleray/device_singleray.vcxproj b/renderer/devices/device_singleray/device_singleray.vcxproj index 892da2e..2722410 100644 --- a/renderer/devices/device_singleray/device_singleray.vcxproj +++ b/renderer/devices/device_singleray/device_singleray.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -44,39 +44,47 @@ DynamicLibrary NotSet true + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet true + v120 DynamicLibrary NotSet + v120 diff --git a/renderer/devices/renderer/renderer.vcxproj b/renderer/devices/renderer/renderer.vcxproj index 74f880c..9ea455d 100644 --- a/renderer/devices/renderer/renderer.vcxproj +++ b/renderer/devices/renderer/renderer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -44,39 +44,47 @@ Application NotSet true + v120 Application NotSet true + v120 Application NotSet true + v120 Application NotSet + v120 Application NotSet true + v120 Application NotSet true + v120 Application NotSet true + v120 Application NotSet + v120 diff --git a/renderer/models/conference/conference.ecs b/renderer/models/conference/conference.ecs index c7a55ed..7b138ca 100644 --- a/renderer/models/conference/conference.ecs +++ b/renderer/models/conference/conference.ecs @@ -8,7 +8,7 @@ -renderer ctrenderer { depth = 9 } #image size --size 256 256 +-size 1024 1024 # number of samples per pixel -spp 1 @@ -32,7 +32,7 @@ -budget 400 #output filename --o conference.tga +-o conference.pfm #light setup