Skip to content

Commit

Permalink
[OGL] Move glIDs.h and glIDswitch.h to OpenGL/
Browse files Browse the repository at this point in the history
`glIDs.h` technically is still in `codegen/`, but now it's being copied
to `OpenGL/common/include`.
  • Loading branch information
ggrzybow authored and gitsgh committed Aug 30, 2024
1 parent 567786c commit be9bdb0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ third_party/*
recorder/gits_config.txt

# OpenGL
common/include/glIDswitch.h
common/include/glIDs.h
OpenGL/common/include/glIDswitch.h
OpenGL/common/include/glIDs.h
OpenGL/common/glFunctions.cpp
OpenGL/common/include/glDrivers.h
OpenGL/common/include/glFunctions.h
Expand Down
4 changes: 2 additions & 2 deletions OpenGL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ set_target_properties(OpenGL_codegen PROPERTIES FOLDER OpenGL)
# GENERATED property is set in CMakeLists.txt in each directory, but this
# staying here doesn't do any harm
set_source_files_properties(
${CMAKE_CURRENT_SOURCE_DIR}/../common/include/glIDs.h
${CMAKE_CURRENT_SOURCE_DIR}/../common/include/glIDswitch.h
${CMAKE_CURRENT_SOURCE_DIR}/common/include/glIDs.h
${CMAKE_CURRENT_SOURCE_DIR}/common/include/glIDswitch.h
${CMAKE_CURRENT_SOURCE_DIR}/common/include/glDrivers.h
${CMAKE_CURRENT_SOURCE_DIR}/common/include/glFunctions.h
${CMAKE_CURRENT_SOURCE_DIR}/common/glFunctions.cpp
Expand Down
4 changes: 2 additions & 2 deletions OpenGL/codegen/gitsGLFuncsGenerator.py
Original file line number Diff line number Diff line change
Expand Up @@ -1232,8 +1232,8 @@ def copy_file(filename, subdir):
shutil.copy2(filename, path)


copy_file('glIDs.h', '../common/include')
move_file('glIDswitch.h', '../common/include')
copy_file('glIDs.h', 'common/include')
move_file('glIDswitch.h', 'common/include')
move_file('glDrivers.h', 'common/include')
move_file('glFunctions.h', 'common/include')
move_file('glFunctions.cpp', 'common')
Expand Down
12 changes: 6 additions & 6 deletions OpenGL/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
# ===================== end_copyright_notice ==============================

set_source_files_properties(
${CMAKE_CURRENT_SOURCE_DIR}/../../common/include/glIDs.h
${CMAKE_CURRENT_SOURCE_DIR}/../../common/include/glIDswitch.h
${CMAKE_CURRENT_SOURCE_DIR}/include/glIDs.h
${CMAKE_CURRENT_SOURCE_DIR}/include/glIDswitch.h
${CMAKE_CURRENT_SOURCE_DIR}/include/glDrivers.h
${CMAKE_CURRENT_SOURCE_DIR}/include/glFunctions.h
${CMAKE_CURRENT_SOURCE_DIR}/glFunctions.cpp
PROPERTIES GENERATED 1
)

add_library(OpenGL_common
../../common/include/glIDs.h
../../common/include/glIDswitch.h
include/glIDs.h
include/glIDswitch.h
include/clientArrays.h
include/eglArguments.h
include/eglFunctions.h
Expand Down Expand Up @@ -87,8 +87,8 @@ add_library(OpenGL_common
)

source_group("Generated Files" FILES
../../common/include/glIDs.h
../../common/include/glIDswitch.h
include/glIDs.h
include/glIDswitch.h
include/glDrivers.h
include/glFunctions.h
glFunctions.cpp)
Expand Down

0 comments on commit be9bdb0

Please sign in to comment.