Build out to libGL.a instead of libGLdc.a
This commit is contained in:
parent
2b3c083de3
commit
5c762b969e
@ -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
|
||||
|
@ -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})
|
||||
|
@ -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(
|
||||
|
Loading…
Reference in New Issue
Block a user