From 5c762b969e1e21197d892c14888d2ff799252f3c Mon Sep 17 00:00:00 2001 From: Luke Benstead Date: Wed, 29 Nov 2023 11:25:52 +0000 Subject: [PATCH] Build out to libGL.a instead of libGLdc.a --- .gitlab-ci.yml | 6 +++--- CMakeLists.txt | 8 ++++---- tests/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01e03dd..b24bbeb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,11 +11,11 @@ build:sh4-gcc: - cd builddir - cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/Dreamcast.cmake -DCMAKE_BUILD_TYPE=Release .. - make - - tar -zcf gldc.tar.gz libGLdc.a ../LICENSE ../README.md ../include + - tar -zcf gldc.tar.gz libGL.a ../LICENSE ../README.md ../include artifacts: paths: - builddir/gldc.tar.gz - + build:x86-gcc: stage: build image: fedora:38 @@ -29,7 +29,7 @@ build:x86-gcc: artifacts: paths: - builddir/tests/gldc_tests - + test:x86-gcc: stage: test image: fedora:38 diff --git a/CMakeLists.txt b/CMakeLists.txt index 65b940f..0f7f87a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,14 +109,14 @@ else() ) endif() -add_library(GLdc STATIC ${SOURCES}) +add_library(GL STATIC ${SOURCES}) if(FLTO_SUPPORTED) - set_property(TARGET GLdc PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) + set_property(TARGET GL PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) endif() if(NOT PLATFORM_DREAMCAST) -set_target_properties(GLdc PROPERTIES +set_target_properties(GL PROPERTIES COMPILE_OPTIONS "-m32" LINK_OPTIONS "-m32" ) @@ -126,7 +126,7 @@ link_libraries(m) include_directories(include) -link_libraries(GLdc) +link_libraries(GL) function(gen_sample sample) set(SAMPLE_SRCS ${ARGN}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7dc2faf..584e953 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,7 +14,7 @@ ADD_CUSTOM_COMMAND( ) add_executable(gldc_tests ${TEST_FILES} ${TEST_SOURCES} ${TEST_MAIN_FILENAME}) -target_link_libraries(gldc_tests GLdc) +target_link_libraries(gldc_tests GL) if(NOT PLATFORM_DREAMCAST) set_target_properties(