goat3dgfx
diff goat3dgfx.vcproj @ 25:6236080aaea4
LIBOVR conditional compilation fix
| author | John Tsiombikas <nuclear@member.fsf.org> |
|---|---|
| date | Thu, 27 Feb 2014 01:40:12 +0200 |
| parents | f2da87b02fcd |
| children | 940e5b1e2f92 |
line diff
1.1 --- a/goat3dgfx.vcproj Tue Feb 25 23:47:48 2014 +0200 1.2 +++ b/goat3dgfx.vcproj Thu Feb 27 01:40:12 2014 +0200 1.3 @@ -25,6 +25,7 @@ 1.4 > 1.5 <Tool 1.6 Name="VCPreBuildEventTool" 1.7 + CommandLine="echo #ifndef GOAT3DGFX_CONFIG_H_>$(ProjectDir)\src\config.h
echo #define GOAT3DGFX_CONFIG_H_>>$(ProjectDir)\src\config.h
echo #define USE_VR>>$(ProjectDir)\src\config.h
echo #define USE_LIBOVR>>$(ProjectDir)\src\config.h
echo #endif>>$(ProjectDir)\src\config.h
" 1.8 /> 1.9 <Tool 1.10 Name="VCCustomBuildTool" 1.11 @@ -41,6 +42,7 @@ 1.12 <Tool 1.13 Name="VCCLCompilerTool" 1.14 Optimization="0" 1.15 + AdditionalIncludeDirectories="$(SolutionDir)\src" 1.16 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOAT3DGFX_EXPORTS" 1.17 MinimalRebuild="true" 1.18 BasicRuntimeChecks="3" 1.19 @@ -61,6 +63,7 @@ 1.20 /> 1.21 <Tool 1.22 Name="VCLibrarianTool" 1.23 + AdditionalDependencies="libovrd.lib" 1.24 OutputFile="$(OutDir)\$(ProjectName)-dbg.lib" 1.25 /> 1.26 <Tool 1.27 @@ -77,7 +80,7 @@ 1.28 /> 1.29 <Tool 1.30 Name="VCPostBuildEventTool" 1.31 - CommandLine="mkdir usr\include\goat3dgfx
mkdir usr\lib
copy /Y src\*.h usr\include\goat3dgfx\
copy /Y src\*.inl usr\include\goat3dgfx\
copy /Y $(TargetPath) usr\lib\" 1.32 + CommandLine="mkdir usr\include\goat3dgfx
mkdir usr\lib
copy /Y src\*.h usr\include\goat3dgfx\
copy /Y src\*.inl usr\include\goat3dgfx\
copy /Y $(TargetPath) usr\lib\
" 1.33 /> 1.34 </Configuration> 1.35 <Configuration 1.36 @@ -90,6 +93,7 @@ 1.37 > 1.38 <Tool 1.39 Name="VCPreBuildEventTool" 1.40 + CommandLine="echo #ifndef GOAT3DGFX_CONFIG_H_>$(ProjectDir)\src\config.h
echo #define GOAT3DGFX_CONFIG_H_>>$(ProjectDir)\src\config.h
echo #define USE_VR>>$(ProjectDir)\src\config.h
echo #define USE_LIBOVR>>$(ProjectDir)\src\config.h
echo #endif>>$(ProjectDir)\src\config.h
" 1.41 /> 1.42 <Tool 1.43 Name="VCCustomBuildTool" 1.44 @@ -107,6 +111,7 @@ 1.45 Name="VCCLCompilerTool" 1.46 Optimization="2" 1.47 EnableIntrinsicFunctions="true" 1.48 + AdditionalIncludeDirectories="$(SolutionDir)\src" 1.49 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOAT3DGFX_EXPORTS" 1.50 RuntimeLibrary="2" 1.51 EnableFunctionLevelLinking="true" 1.52 @@ -126,6 +131,7 @@ 1.53 /> 1.54 <Tool 1.55 Name="VCLibrarianTool" 1.56 + AdditionalDependencies="libovr.lib" 1.57 /> 1.58 <Tool 1.59 Name="VCALinkTool" 1.60 @@ -149,7 +155,7 @@ 1.61 <Files> 1.62 <Filter 1.63 Name="src" 1.64 - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" 1.65 + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;h;inl" 1.66 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" 1.67 > 1.68 <File 1.69 @@ -161,113 +167,35 @@ 1.70 > 1.71 </File> 1.72 <File 1.73 + RelativePath=".\src\assload.h" 1.74 + > 1.75 + </File> 1.76 + <File 1.77 + RelativePath=".\src\camera.cc" 1.78 + > 1.79 + </File> 1.80 + <File 1.81 + RelativePath=".\src\camera.h" 1.82 + > 1.83 + </File> 1.84 + <File 1.85 RelativePath=".\src\curve.cc" 1.86 > 1.87 </File> 1.88 <File 1.89 + RelativePath=".\src\curve.h" 1.90 + > 1.91 + </File> 1.92 + <File 1.93 RelativePath=".\src\curveload.cc" 1.94 > 1.95 </File> 1.96 <File 1.97 - RelativePath=".\src\datapath.cc" 1.98 + RelativePath=".\src\curveload.h" 1.99 > 1.100 </File> 1.101 <File 1.102 - RelativePath=".\src\geom.cc" 1.103 - > 1.104 - </File> 1.105 - <File 1.106 - RelativePath=".\src\gfxutil.cc" 1.107 - > 1.108 - </File> 1.109 - <File 1.110 - RelativePath=".\src\image.cc" 1.111 - > 1.112 - </File> 1.113 - <File 1.114 - RelativePath=".\src\logger.cc" 1.115 - > 1.116 - </File> 1.117 - <File 1.118 - RelativePath=".\src\material.cc" 1.119 - > 1.120 - </File> 1.121 - <File 1.122 - RelativePath=".\src\mesh.cc" 1.123 - > 1.124 - </File> 1.125 - <File 1.126 - RelativePath=".\src\meshgen.cc" 1.127 - > 1.128 - </File> 1.129 - <File 1.130 - RelativePath=".\src\object.cc" 1.131 - > 1.132 - </File> 1.133 - <File 1.134 - RelativePath=".\src\opengl.cc" 1.135 - > 1.136 - </File> 1.137 - <File 1.138 - RelativePath=".\src\psyspp.cc" 1.139 - > 1.140 - </File> 1.141 - <File 1.142 - RelativePath=".\src\rtarg.cc" 1.143 - > 1.144 - </File> 1.145 - <File 1.146 - RelativePath=".\src\scene.cc" 1.147 - > 1.148 - </File> 1.149 - <File 1.150 - RelativePath=".\src\sdrman.cc" 1.151 - > 1.152 - </File> 1.153 - <File 1.154 - RelativePath=".\src\shader.cc" 1.155 - > 1.156 - </File> 1.157 - <File 1.158 - RelativePath=".\src\texgen.cc" 1.159 - > 1.160 - </File> 1.161 - <File 1.162 - RelativePath=".\src\texman.cc" 1.163 - > 1.164 - </File> 1.165 - <File 1.166 - RelativePath=".\src\texture.cc" 1.167 - > 1.168 - </File> 1.169 - <File 1.170 - RelativePath=".\src\timer.cc" 1.171 - > 1.172 - </File> 1.173 - <File 1.174 - RelativePath=".\src\unistate.cc" 1.175 - > 1.176 - </File> 1.177 - <File 1.178 - RelativePath=".\src\xform_node.cc" 1.179 - > 1.180 - </File> 1.181 - </Filter> 1.182 - <Filter 1.183 - Name="include" 1.184 - Filter="h;hpp;hxx;hm;inl;inc;xsd" 1.185 - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" 1.186 - > 1.187 - <File 1.188 - RelativePath=".\src\assload.h" 1.189 - > 1.190 - </File> 1.191 - <File 1.192 - RelativePath=".\src\curve.h" 1.193 - > 1.194 - </File> 1.195 - <File 1.196 - RelativePath=".\src\curveload.h" 1.197 + RelativePath=".\src\datapath.cc" 1.198 > 1.199 </File> 1.200 <File 1.201 @@ -283,85 +211,193 @@ 1.202 > 1.203 </File> 1.204 <File 1.205 + RelativePath=".\src\geom.cc" 1.206 + > 1.207 + </File> 1.208 + <File 1.209 RelativePath=".\src\geom.h" 1.210 > 1.211 </File> 1.212 <File 1.213 + RelativePath=".\src\gfxutil.cc" 1.214 + > 1.215 + </File> 1.216 + <File 1.217 RelativePath=".\src\gfxutil.h" 1.218 > 1.219 </File> 1.220 <File 1.221 + RelativePath=".\src\goat3dgfx.cc" 1.222 + > 1.223 + </File> 1.224 + <File 1.225 + RelativePath=".\src\goat3dgfx.h" 1.226 + > 1.227 + </File> 1.228 + <File 1.229 + RelativePath=".\src\image.cc" 1.230 + > 1.231 + </File> 1.232 + <File 1.233 RelativePath=".\src\image.h" 1.234 > 1.235 </File> 1.236 <File 1.237 + RelativePath=".\src\logger.cc" 1.238 + > 1.239 + </File> 1.240 + <File 1.241 RelativePath=".\src\logger.h" 1.242 > 1.243 </File> 1.244 <File 1.245 + RelativePath=".\src\material.cc" 1.246 + > 1.247 + </File> 1.248 + <File 1.249 RelativePath=".\src\material.h" 1.250 > 1.251 </File> 1.252 <File 1.253 + RelativePath=".\src\mesh.cc" 1.254 + > 1.255 + </File> 1.256 + <File 1.257 RelativePath=".\src\mesh.h" 1.258 > 1.259 </File> 1.260 <File 1.261 + RelativePath=".\src\meshgen.cc" 1.262 + > 1.263 + </File> 1.264 + <File 1.265 RelativePath=".\src\meshgen.h" 1.266 > 1.267 </File> 1.268 <File 1.269 + RelativePath=".\src\object.cc" 1.270 + > 1.271 + </File> 1.272 + <File 1.273 RelativePath=".\src\object.h" 1.274 > 1.275 </File> 1.276 <File 1.277 + RelativePath=".\src\opengl.cc" 1.278 + > 1.279 + </File> 1.280 + <File 1.281 RelativePath=".\src\opengl.h" 1.282 > 1.283 </File> 1.284 <File 1.285 + RelativePath=".\src\psyspp.cc" 1.286 + > 1.287 + </File> 1.288 + <File 1.289 RelativePath=".\src\psyspp.h" 1.290 > 1.291 </File> 1.292 <File 1.293 + RelativePath=".\src\rtarg.cc" 1.294 + > 1.295 + </File> 1.296 + <File 1.297 RelativePath=".\src\rtarg.h" 1.298 > 1.299 </File> 1.300 <File 1.301 + RelativePath=".\src\scene.cc" 1.302 + > 1.303 + </File> 1.304 + <File 1.305 RelativePath=".\src\scene.h" 1.306 > 1.307 </File> 1.308 <File 1.309 + RelativePath=".\src\sdrman.cc" 1.310 + > 1.311 + </File> 1.312 + <File 1.313 RelativePath=".\src\sdrman.h" 1.314 > 1.315 </File> 1.316 <File 1.317 + RelativePath=".\src\shader.cc" 1.318 + > 1.319 + </File> 1.320 + <File 1.321 RelativePath=".\src\shader.h" 1.322 > 1.323 </File> 1.324 <File 1.325 + RelativePath=".\src\texgen.cc" 1.326 + > 1.327 + </File> 1.328 + <File 1.329 RelativePath=".\src\texgen.h" 1.330 > 1.331 </File> 1.332 <File 1.333 + RelativePath=".\src\texman.cc" 1.334 + > 1.335 + </File> 1.336 + <File 1.337 RelativePath=".\src\texman.h" 1.338 > 1.339 </File> 1.340 <File 1.341 + RelativePath=".\src\texture.cc" 1.342 + > 1.343 + </File> 1.344 + <File 1.345 RelativePath=".\src\texture.h" 1.346 > 1.347 </File> 1.348 <File 1.349 + RelativePath=".\src\timer.cc" 1.350 + > 1.351 + </File> 1.352 + <File 1.353 RelativePath=".\src\timer.h" 1.354 > 1.355 </File> 1.356 <File 1.357 + RelativePath=".\src\unistate.cc" 1.358 + > 1.359 + </File> 1.360 + <File 1.361 RelativePath=".\src\unistate.h" 1.362 > 1.363 </File> 1.364 <File 1.365 + RelativePath=".\src\vr.h" 1.366 + > 1.367 + </File> 1.368 + <File 1.369 + RelativePath=".\src\xform_node.cc" 1.370 + > 1.371 + </File> 1.372 + <File 1.373 RelativePath=".\src\xform_node.h" 1.374 > 1.375 </File> 1.376 + <Filter 1.377 + Name="vr" 1.378 + > 1.379 + <File 1.380 + RelativePath=".\src\vr\vr.cc" 1.381 + > 1.382 + </File> 1.383 + <File 1.384 + RelativePath=".\src\vr\vr_impl.h" 1.385 + > 1.386 + </File> 1.387 + <File 1.388 + RelativePath=".\src\vr\vr_sdr.h" 1.389 + > 1.390 + </File> 1.391 + </Filter> 1.392 </Filter> 1.393 </Files> 1.394 <Globals>