OSDN Git Service
(root)
/
psychlops
/
cpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test
[psychlops/cpp.git]
/
win32gl
/
test
/
Psychlops_win32cblibtest.cbp
diff --git
a/win32gl/test/Psychlops_win32cblibtest.cbp
b/win32gl/test/Psychlops_win32cblibtest.cbp
index
79f0dce
..
78cab64
100644
(file)
--- a/
win32gl/test/Psychlops_win32cblibtest.cbp
+++ b/
win32gl/test/Psychlops_win32cblibtest.cbp
@@
-46,7
+46,7
@@
</Compiler>
<Linker>
<Add option="-s" />
</Compiler>
<Linker>
<Add option="-s" />
- <Add library="..\dev\libpsychlopswin32gcc.a" />
+ <Add library="..\dev\libpsychlopswin32gcc
4
.a" />
<Add library="lib\libpng_mingw.a" />
<Add library="lib\libfftw3.a" />
<Add library="opengl32" />
<Add library="lib\libpng_mingw.a" />
<Add library="lib\libfftw3.a" />
<Add library="opengl32" />
@@
-145,7
+145,7
@@
<Option output="Psychlops_win32cblibtest_vc12.exe" prefix_auto="0" extension_auto="0" />
<Option object_output=".objs_vc10" />
<Option type="1" />
<Option output="Psychlops_win32cblibtest_vc12.exe" prefix_auto="0" extension_auto="0" />
<Option object_output=".objs_vc10" />
<Option type="1" />
- <Option compiler="m
icrosoft_visual_c_2013_
vc12" />
+ <Option compiler="m
s
vc12" />
<Option projectCompilerOptionsRelation="1" />
<Compiler>
<Add option="/GA" />
<Option projectCompilerOptionsRelation="1" />
<Compiler>
<Add option="/GA" />
@@
-180,18
+180,19
@@
<Option compile="0" />
<Option link="0" />
</Unit>
<Option compile="0" />
<Option link="0" />
</Unit>
- <Unit filename="b
ugfix
.cpp">
+ <Unit filename="b
asickFlickerTest
.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Option compile="0" />
<Option link="0" />
</Unit>
- <Unit filename="
compilenew
.cpp">
+ <Unit filename="
bugfix
.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Option compile="0" />
<Option link="0" />
</Unit>
- <Unit filename="
fftfirm
.cpp">
+ <Unit filename="
compilenew
.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Option compile="0" />
<Option link="0" />
</Unit>
+ <Unit filename="fftfirm.cpp" />
<Unit filename="inputTest.cpp">
<Option compile="0" />
<Option link="0" />
<Unit filename="inputTest.cpp">
<Option compile="0" />
<Option link="0" />
@@
-204,7
+205,10
@@
<Option compile="0" />
<Option link="0" />
</Unit>
<Option compile="0" />
<Option link="0" />
</Unit>
- <Unit filename="opencvtest.cpp" />
+ <Unit filename="opencvtest.cpp">
+ <Option compile="0" />
+ <Option link="0" />
+ </Unit>
<Unit filename="shader/ShaderDot.cpp">
<Option compile="0" />
<Option link="0" />
<Unit filename="shader/ShaderDot.cpp">
<Option compile="0" />
<Option link="0" />
@@
-221,6
+225,10
@@
<Option compile="0" />
<Option link="0" />
</Unit>
<Option compile="0" />
<Option link="0" />
</Unit>
+ <Unit filename="shader/ShaderLoader.cpp">
+ <Option compile="0" />
+ <Option link="0" />
+ </Unit>
<Unit filename="shader/ShaderPlaidsBench.cpp">
<Option compile="0" />
<Option link="0" />
<Unit filename="shader/ShaderPlaidsBench.cpp">
<Option compile="0" />
<Option link="0" />