Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

small fixes so that lib can be compiled in Win32 with Visual Studio 2013 (Express) #50

Closed
wants to merge 7 commits into from
Closed

small fixes so that lib can be compiled in Win32 with Visual Studio 2013 (Express) #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34485ff
this file does not exist anymore
raymond-w-ko May 20, 2014
0736ed5
include <algorithm> to get std::min and std::max
raymond-w-ko May 20, 2014
a4bab4e
add dummy UNIX header so that library compiles
raymond-w-ko May 20, 2014
4111ea4
do not ignore these files as I am investigating why compilation fails…
raymond-w-ko May 20, 2014
3387629
add generated files
raymond-w-ko May 20, 2014
78a6547
since only Win32 CMake has a registry write command, wrap with #ifdef…
raymond-w-ko May 20, 2014
149efbf
Merge branch 'win32_only_ifdef'
raymond-w-ko May 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ CMakeCache.txt
Makefile
build/
lib/
Gen_hlslang.cpp
gen_hlslang.cpp
Gen_hlslang_tab.cpp
hlslang_tab.cpp
hlslang.output
hlslang_tab.h
#Gen_hlslang.cpp
#gen_hlslang.cpp
#Gen_hlslang_tab.cpp
#hlslang_tab.cpp
#hlslang.output
#hlslang_tab.h
tests/out-*.txt
*.dSYM
tests/hlsl2glsltest/hlsl2glsltest
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ set(MACHINE_INDEPENDENT_CPP_FILES
source_group("Machine Independent\\CPP" FILES ${MACHINE_INDEPENDENT_CPP_FILES})


EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E write_regv \"${hkey}\" \"${dir}\"")
if (WIN32)
EXEC_PROGRAM(${CMAKE_COMMAND} ARGS "-E write_regv \"${hkey}\" \"${dir}\"")
endif ()


set(MACHINE_INDEPENDENT_GENERATED_SOURCE_FILES
Expand Down
3 changes: 0 additions & 3 deletions hlslang.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@
<ClCompile Include="hlslang\GLSLCodeGen\typeSamplers.cpp">
<Filter>GLSL Code Gen</Filter>
</ClCompile>
<ClCompile Include="hlslang\OSDependent\Windows\main.cpp">
<Filter>OSDependent\Windows</Filter>
</ClCompile>
<ClCompile Include="hlslang\OSDependent\Windows\ossource.cpp">
<Filter>OSDependent\Windows</Filter>
</ClCompile>
Expand Down
Loading