this repo has no description
Added a _s suffix for the MSVC static library. Organized the build output directories and added a copy step for other files so the output directory can simply be zipped up and released.
+50
-30
+1
-1
LICENSE.txt
+1
-1
LICENSE.txt
···
1
1
The MIT License (MIT)
2
-
Copyright (c) 2015 Jonathan Dearborn
2
+
Copyright (c) 2019 Jonathan Dearborn
3
3
4
4
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5
5
+49
-29
src/CMakeLists.txt
+49
-29
src/CMakeLists.txt
···
47
47
endif(STBI_WRITE_FOUND)
48
48
49
49
50
-
set(SDL_gpu_install_HDRS
50
+
set(SDL_gpu_public_HDRS
51
51
../include/SDL_gpu.h
52
52
../include/SDL_gpu_RendererImpl.h
53
53
../include/SDL_gpu_OpenGL_1_BASE.h
···
67
67
set (SDL_gpu_OUTPUT_NAME "SDL2_gpu")
68
68
endif ( SDL_gpu_USE_SDL1)
69
69
70
+
set (SDL_gpu_SHARED_OUTPUT ${SDL_gpu_OUTPUT_NAME})
71
+
72
+
if(WIN32)
73
+
set (SDL_gpu_STATIC_OUTPUT ${SDL_gpu_OUTPUT_NAME}_s)
74
+
else(WIN32)
75
+
set (SDL_gpu_STATIC_OUTPUT ${SDL_gpu_OUTPUT_NAME})
76
+
endif(WIN32)
77
+
78
+
if(MSVC)
79
+
set(OUTPUT_DIR SDL_gpu-VS-${SDL_gpu_VERSION})
80
+
elseif(MINGW)
81
+
set(OUTPUT_DIR SDL_gpu-MINGW-${SDL_gpu_VERSION})
82
+
else()
83
+
set(OUTPUT_DIR SDL_gpu-${SDL_gpu_VERSION})
84
+
endif()
85
+
70
86
if(APPLE)
71
87
set(CMAKE_MACOSX_RPATH 1)
72
88
# use, i.e. don't skip the full RPATH for the build tree
···
82
98
endif()
83
99
84
100
85
-
# Copy includes to output lib/include
86
-
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
87
-
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/lib/include)
88
-
foreach(INC_FILE ${SDL_gpu_install_HDRS})
101
+
# Copy includes to output ${OUTPUT_DIR}/include
102
+
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${OUTPUT_DIR})
103
+
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/bin)
104
+
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/include)
105
+
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/lib)
106
+
foreach(INC_FILE ${SDL_gpu_public_HDRS})
89
107
get_filename_component(BASE ${INC_FILE} NAME)
90
-
configure_file(${INC_FILE} ${CMAKE_BINARY_DIR}/lib/include/${BASE} COPYONLY)
108
+
configure_file(${INC_FILE} ${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/include/${BASE} COPYONLY)
91
109
endforeach(INC_FILE)
110
+
111
+
configure_file(${CMAKE_SOURCE_DIR}/LICENSE.txt ${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/LICENSE.txt COPYONLY)
112
+
configure_file(${CMAKE_SOURCE_DIR}/README.md ${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/README.md COPYONLY)
92
113
93
114
# Build the shared library (.so or .dll)
94
115
if(SDL_gpu_BUILD_SHARED)
···
106
127
set_target_properties(SDL_gpu_shared PROPERTIES
107
128
FRAMEWORK TRUE
108
129
FRAMEWORK_VERSION "A"
109
-
PUBLIC_HEADER "${SDL_gpu_install_HDRS}"
130
+
PUBLIC_HEADER "${SDL_gpu_public_HDRS}"
110
131
#RESOURCE "${RESOURCE_FILES}"
111
132
VERSION ${SDL_gpu_VERSION}
112
133
SOVERSION ${SDL_gpu_VERSION}
113
-
OUTPUT_NAME ${SDL_gpu_OUTPUT_NAME}
114
-
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
115
-
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
116
-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
134
+
OUTPUT_NAME ${SDL_gpu_SHARED_OUTPUT}
135
+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/lib"
136
+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/lib"
137
+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/bin"
117
138
)
118
139
# Short Version is the "marketing version". It is the version
119
140
# the user sees in an information panel.
120
141
SET(MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${SDL_gpu_VERSION}")
121
142
# Bundle version is the version the OS looks at.
122
143
SET(MACOSX_FRAMEWORK_BUNDLE_VERSION "${SDL_gpu_VERSION}")
123
-
# FIXME: org.libsdl probably isn't the right domain
124
-
SET(MACOSX_FRAMEWORK_IDENTIFIER "org.libsdl.sdl-gpu")
144
+
SET(MACOSX_FRAMEWORK_IDENTIFIER "com.dinomage.sdl-gpu")
125
145
126
146
127
147
128
148
else()
129
149
if(ANDROID)
130
150
set_target_properties(SDL_gpu_shared PROPERTIES
131
-
OUTPUT_NAME ${SDL_gpu_OUTPUT_NAME}
151
+
OUTPUT_NAME ${SDL_gpu_SHARED_OUTPUT}
132
152
CLEAN_DIRECT_OUTPUT 1
133
-
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
134
-
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
135
-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
153
+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/lib"
154
+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/lib"
155
+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/bin"
136
156
)
137
157
else()
138
158
set_target_properties(SDL_gpu_shared PROPERTIES
139
-
OUTPUT_NAME ${SDL_gpu_OUTPUT_NAME}
159
+
OUTPUT_NAME ${SDL_gpu_SHARED_OUTPUT}
140
160
CLEAN_DIRECT_OUTPUT 1
141
161
# VERSION ${SDL_gpu_VERSION}
142
-
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
143
-
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
144
-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
162
+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/lib"
163
+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/lib"
164
+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/bin"
145
165
)
146
166
endif()
147
167
···
162
182
set_property(TARGET SDL_gpu PROPERTY C_STANDARD 99)
163
183
endif()
164
184
set_target_properties(SDL_gpu PROPERTIES
165
-
OUTPUT_NAME ${SDL_gpu_OUTPUT_NAME}
185
+
OUTPUT_NAME ${SDL_gpu_STATIC_OUTPUT}
166
186
CLEAN_DIRECT_OUTPUT 1
167
187
VERSION ${SDL_gpu_VERSION}
168
-
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
169
-
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
170
-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
188
+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/lib"
189
+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/lib"
190
+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DIR}/bin"
171
191
)
172
192
set_target_properties(SDL_gpu PROPERTIES LINKER_LANGUAGE C)
173
193
if(APPLE)
···
181
201
# Install the headers and library
182
202
if(SDL_gpu_INSTALL)
183
203
if(SDL_gpu_USE_SDL1)
184
-
install(FILES ${SDL_gpu_install_HDRS} DESTINATION include/SDL)
204
+
install(FILES ${SDL_gpu_public_HDRS} DESTINATION include/SDL)
185
205
else(SDL_gpu_USE_SDL1)
186
-
install(FILES ${SDL_gpu_install_HDRS} DESTINATION include/SDL2)
206
+
install(FILES ${SDL_gpu_public_HDRS} DESTINATION include/SDL2)
187
207
endif(SDL_gpu_USE_SDL1)
188
208
189
209
if(SDL_gpu_BUILD_SHARED)
190
-
install(TARGETS SDL_gpu_shared EXPORT SDL_gpu-targets DESTINATION lib)
210
+
install(TARGETS SDL_gpu_shared EXPORT SDL_gpu-targets DESTINATION ${OUTPUT_DIR}/lib)
191
211
endif()
192
212
if(SDL_gpu_BUILD_STATIC)
193
-
install(TARGETS SDL_gpu EXPORT SDL_gpu-targets DESTINATION lib)
213
+
install(TARGETS SDL_gpu EXPORT SDL_gpu-targets DESTINATION ${OUTPUT_DIR}/lib)
194
214
endif()
195
215
196
216
endif(SDL_gpu_INSTALL)