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.

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

Fix too many letters #1585

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
362 changes: 181 additions & 181 deletions CMakeLists.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README_android.txt
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,9 @@ native-lib.cpp and replace its code with this:
al_flip_display();
redraw = false;
}
ALLEGRO_EVENT event;
A5O_EVENT event;
al_wait_for_event(queue, &event);
if (event.type == ALLEGRO_EVENT_TIMER) {
if (event.type == A5O_EVENT_TIMER) {
redraw = true;
}
}
Expand Down
6 changes: 3 additions & 3 deletions README_macosx.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ will be larger than is reported by the OS. When changing the display DPI or
moving the window between two displays with different DPIs, Allegro displays
behave in the following way:

- If the ALLEGRO_DISPLAY was created with the ALLEGRO_RESIZABLE flag it will
send an ALLEGRO_DISPLAY_RESIZE event. This will have the effect of your app's
- If the A5O_DISPLAY was created with the A5O_RESIZABLE flag it will
send an A5O_DISPLAY_RESIZE event. This will have the effect of your app's
window remaining visually the same, while the display size in pixels will
increase or decrease. This is the recommended situation.

- If the ALLEGRO_DISPLAY was not created with the ALLEGRO_RESIZABLE flag, then
- If the A5O_DISPLAY was not created with the A5O_RESIZABLE flag, then
the display size in pixels will remain the same, but the app's window will
appear to grow or shrink.
2 changes: 1 addition & 1 deletion README_msvc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Once done, press "Configure" again.
*Note:*
As of the time this is written, CMake has a bug that causes the DLLs in
MSVC 10 to be named incorrectly. To work around this, generate MSVC 9 projects
instead. You may need to uncomment the line "#define ALLEGRO_HAVE_STDINT_H"
instead. You may need to uncomment the line "#define A5O_HAVE_STDINT_H"
in alplatf.h. Alternatively, use nmake instead of project files.

9. Open up the project solution with the MSVC IDE and start building.
Expand Down
6 changes: 3 additions & 3 deletions README_pkgconfig.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ option provides that information. You can combine it with `--libs` as well:
Most build systems will allow you to call pkg-config in a similar way to the
shell. For example, a very basic Makefile might look like this:

ALLEGRO_LIBRARIES := allegro-5 allegro_image-5
ALLEGRO_FLAGS := $(shell pkg-config --cflags --libs $(ALLEGRO_LIBRARIES))
A5O_LIBRARIES := allegro-5 allegro_image-5
A5O_FLAGS := $(shell pkg-config --cflags --libs $(A5O_LIBRARIES))

mygame: mygame.c
$(CC) -o $@ $^ $(ALLEGRO_FLAGS)
$(CC) -o $@ $^ $(A5O_FLAGS)


Historical note
Expand Down
6 changes: 3 additions & 3 deletions README_sdl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SDL2 is required.
Building
--------

Pass -D ALLEGRO_SDL=on to cmake to enable building for SDL2.
Pass -D A5O_SDL=on to cmake to enable building for SDL2.


Limitations
Expand Down Expand Up @@ -72,14 +72,14 @@ EM_CACHE=path-to-emsdk/upstream/emscripten/cache

emcmake cmake .. \
-D CMAKE_BUILD_TYPE=Release \
-D ALLEGRO_SDL=ON \
-D A5O_SDL=ON \
-D SHARED=OFF \
-D WANT_MONOLITH=ON \
-D WANT_ALLOW_SSE=OFF \
-D WANT_DOCS=OFF \
-D WANT_TESTS=OFF \
-D WANT_OPENAL=OFF \
-D ALLEGRO_WAIT_EVENT_SLEEP=ON \
-D A5O_WAIT_EVENT_SLEEP=ON \
-D SDL2_INCLUDE_DIR=$EM_CACHE/sysroot/include \
-D CMAKE_C_FLAGS="${USE_FLAGS[*]}" \
-D CMAKE_CXX_FLAGS="${USE_FLAGS[*]}" \
Expand Down
6 changes: 3 additions & 3 deletions README_windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ scaled by the OS. This is mostly transparent on your end, the only complication
comes when the DPI changes on the fly (e.g. your app's window gets moved
between displays with different DPIs):

- If the ALLEGRO_DISPLAY was created with the ALLEGRO_RESIZABLE flag it will
send an ALLEGRO_DISPLAY_RESIZE event. This will have the effect of your app's
- If the A5O_DISPLAY was created with the A5O_RESIZABLE flag it will
send an A5O_DISPLAY_RESIZE event. This will have the effect of your app's
window remaining visually the same, while the display size in pixels will
increase or decrease. This is the recommended situation.

- If the ALLEGRO_DISPLAY was not created with the ALLEGRO_RESIZABLE flag, then
- If the A5O_DISPLAY was not created with the A5O_RESIZABLE flag, then
the display size in pixels will remain the same, but the app's window will
appear to grow or shrink.

Expand Down
4 changes: 2 additions & 2 deletions addons/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ addons_summary("- Video addon" SUPPORT_VIDEO)
add_subdirectory(main)
# SUPPORT_MAIN and MAIN_LINK_WITH are spelt as such in this scope,
# but are prefixed with ALLEGRO in the parent scope.
set(SUPPORT_ALLEGRO_MAIN ${SUPPORT_MAIN} PARENT_SCOPE)
set(ALLEGRO_MAIN_LINK_WITH ${MAIN_LINK_WITH} PARENT_SCOPE)
set(SUPPORT_A5O_MAIN ${SUPPORT_MAIN} PARENT_SCOPE)
set(A5O_MAIN_LINK_WITH ${MAIN_LINK_WITH} PARENT_SCOPE)
list(APPEND ADDON_PKG_CONFIG_FILES allegro_main)

set(MONOLITH_SOURCES ${MONOLITH_SOURCES} PARENT_SCOPE)
Expand Down
38 changes: 19 additions & 19 deletions addons/acodec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ endif(WANT_FLAC)

if(SUPPORT_FLAC)
include_directories(SYSTEM ${FLAC_INCLUDE_DIR})
set(ALLEGRO_CFG_ACODEC_FLAC 1)
set(A5O_CFG_ACODEC_FLAC 1)
list(APPEND ACODEC_SOURCES flac.c)

list(APPEND ACODEC_INCLUDE_DIRECTORIES ${FLAC_INCLUDE_DIR})
Expand All @@ -135,12 +135,12 @@ if(SUPPORT_FLAC)
message("WARNING: Dynamic loading will be disabled for FLAC as"
" static library was found: ${FLAC_LIBRARY}")
else()
get_dll_name(${FLAC_LIBRARY} ALLEGRO_CFG_ACODEC_FLAC_DLL)
get_dll_name(${FLAC_LIBRARY} A5O_CFG_ACODEC_FLAC_DLL)
endif()
endif()
endif(WIN32)

if(NOT ALLEGRO_CFG_ACODEC_FLAC_DLL)
if(NOT A5O_CFG_ACODEC_FLAC_DLL)
list(APPEND ACODEC_LIBRARIES ${FLAC_LIBRARIES})
endif()
endif(SUPPORT_FLAC)
Expand Down Expand Up @@ -184,7 +184,7 @@ endif(WANT_DUMB)

if(SUPPORT_DUMB)
include_directories(SYSTEM ${DUMB_INCLUDE_DIR})
set(ALLEGRO_CFG_ACODEC_DUMB 1)
set(A5O_CFG_ACODEC_DUMB 1)
list(APPEND ACODEC_SOURCES dumb.c)

list(APPEND ACODEC_INCLUDE_DIRECTORIES ${DUMB_INCLUDE_DIR})
Expand All @@ -194,11 +194,11 @@ if(SUPPORT_DUMB)
message("WARNING: Dynamic loading will be disabled for DUMB"
" as static library was found: ${DUMB_LIBRARY}")
else()
get_dll_name(${DUMB_LIBRARY} ALLEGRO_CFG_ACODEC_DUMB_DLL)
get_dll_name(${DUMB_LIBRARY} A5O_CFG_ACODEC_DUMB_DLL)
endif()
endif()

if(NOT ALLEGRO_CFG_ACODEC_DUMB_DLL)
if(NOT A5O_CFG_ACODEC_DUMB_DLL)
list(APPEND ACODEC_LIBRARIES ${DUMB_LIBRARIES})
endif()
endif()
Expand Down Expand Up @@ -229,7 +229,7 @@ endif()

if(SUPPORT_OPENMPT)
include_directories(SYSTEM ${OPENMPT_INCLUDE_DIR})
set(ALLEGRO_CFG_ACODEC_OPENMPT 1)
set(A5O_CFG_ACODEC_OPENMPT 1)
list(APPEND ACODEC_SOURCES openmpt.c)
list(APPEND ACODEC_INCLUDE_DIRECTORIES ${OPENMPT_INCLUDE_DIR})
list(APPEND ACODEC_LIBRARIES ${OPENMPT_LIBRARIES})
Expand Down Expand Up @@ -261,9 +261,9 @@ if(WANT_TREMOR)
TREMOR_COMPILES)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
if(TREMOR_COMPILES OR IPHONE OR ALLEGRO_RASPBERRYPI)
if(TREMOR_COMPILES OR IPHONE OR A5O_RASPBERRYPI)
set(SUPPORT_VORBIS 1)
endif(TREMOR_COMPILES OR IPHONE OR ALLEGRO_RASPBERRYPI)
endif(TREMOR_COMPILES OR IPHONE OR A5O_RASPBERRYPI)
endif(TREMOR_FOUND)
if(NOT SUPPORT_VORBIS)
message("WARNING: Tremor not found although WANT_TREMOR was specified.")
Expand All @@ -272,7 +272,7 @@ if(WANT_TREMOR)
set(OGG_INCLUDE_DIR ${TREMOR_INCLUDE_DIR})
set(VORBIS_INCLUDE_DIR ${TREMOR_INCLUDE_DIR})
set(VORBIS_LIBRARIES ${TREMOR_LIBRARIES})
set(ALLEGRO_CFG_ACODEC_TREMOR 1)
set(A5O_CFG_ACODEC_TREMOR 1)
endif(NOT SUPPORT_VORBIS)
elseif(WANT_VORBIS)
find_package(Vorbis)
Expand Down Expand Up @@ -310,7 +310,7 @@ endif()

if(SUPPORT_VORBIS)
include_directories(SYSTEM ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
set(ALLEGRO_CFG_ACODEC_VORBIS 1)
set(A5O_CFG_ACODEC_VORBIS 1)
list(APPEND ACODEC_SOURCES ogg.c)

list(APPEND ACODEC_INCLUDE_DIRECTORIES ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
Expand All @@ -320,11 +320,11 @@ if(SUPPORT_VORBIS)
message("WARNING: Dynamic loading will be disabled for Vorbis"
" as static library was found: ${VORBISFILE_LIBRARY}")
else()
get_dll_name(${VORBISFILE_LIBRARY} ALLEGRO_CFG_ACODEC_VORBISFILE_DLL)
get_dll_name(${VORBISFILE_LIBRARY} A5O_CFG_ACODEC_VORBISFILE_DLL)
endif()
endif()

if(NOT ALLEGRO_CFG_ACODEC_VORBISFILE_DLL)
if(NOT A5O_CFG_ACODEC_VORBISFILE_DLL)
list(APPEND ACODEC_LIBRARIES ${VORBIS_LIBRARIES})
endif()
endif(SUPPORT_VORBIS)
Expand Down Expand Up @@ -369,7 +369,7 @@ endif()

if(SUPPORT_OPUS)
include_directories(SYSTEM ${OGG_INCLUDE_DIR} ${OPUS_INCLUDE_DIR})
set(ALLEGRO_CFG_ACODEC_OPUS 1)
set(A5O_CFG_ACODEC_OPUS 1)
list(APPEND ACODEC_SOURCES opus.c)

list(APPEND ACODEC_INCLUDE_DIRECTORIES ${OGG_INCLUDE_DIR} ${OPUS_INCLUDE_DIR})
Expand All @@ -379,11 +379,11 @@ if(SUPPORT_OPUS)
message("WARNING: Dynamic loading will be disabled for Opus"
" as static library was found: ${OPUSFILE_LIBRARY}")
else()
get_dll_name(${OPUSFILE_LIBRARY} ALLEGRO_CFG_ACODEC_OPUSFILE_DLL)
get_dll_name(${OPUSFILE_LIBRARY} A5O_CFG_ACODEC_OPUSFILE_DLL)
endif()
endif()

if(NOT ALLEGRO_CFG_ACODEC_OPUSFILE_DLL)
if(NOT A5O_CFG_ACODEC_OPUSFILE_DLL)
list(APPEND ACODEC_LIBRARIES ${OPUS_LIBRARIES})
endif()
endif(SUPPORT_OPUS)
Expand All @@ -397,7 +397,7 @@ if(WANT_MP3)
find_package(MiniMP3)
if(MINIMP3_FOUND)
include_directories(SYSTEM ${MINIMP3_INCLUDE_DIRS})
set(ALLEGRO_CFG_ACODEC_MP3 1)
set(A5O_CFG_ACODEC_MP3 1)
list(APPEND ACODEC_SOURCES mp3.c)
endif(MINIMP3_FOUND)
if(NOT MINIMP3_FOUND)
Expand All @@ -414,9 +414,9 @@ configure_file(
)

add_our_addon_library(allegro_acodec
AllegroAcodec-${ALLEGRO_SOVERSION}
AllegroAcodec-${A5O_SOVERSION}
"${ACODEC_SOURCES};${ACODEC_INCLUDE_FILES}"
"-DALLEGRO_ACODEC_SRC ${FLAC__NO_DLL}"
"-DA5O_ACODEC_SRC ${FLAC__NO_DLL}"
"${AUDIO_LINK_WITH};${ACODEC_LIBRARIES}"
)

Expand Down
14 changes: 7 additions & 7 deletions addons/acodec/acodec.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ static bool acodec_inited = false;
*/
uint32_t al_get_allegro_acodec_version(void)
{
return ALLEGRO_VERSION_INT;
return A5O_VERSION_INT;
}


Expand All @@ -35,40 +35,40 @@ bool al_init_acodec_addon(void)
ret &= al_register_sample_loader_f(".voc", _al_load_voc_f);
ret &= al_register_sample_identifier(".voc", _al_identify_voc);

#ifdef ALLEGRO_CFG_ACODEC_FLAC
#ifdef A5O_CFG_ACODEC_FLAC
ret &= al_register_sample_loader(".flac", _al_load_flac);
ret &= al_register_audio_stream_loader(".flac", _al_load_flac_audio_stream);
ret &= al_register_sample_loader_f(".flac", _al_load_flac_f);
ret &= al_register_audio_stream_loader_f(".flac", _al_load_flac_audio_stream_f);
ret &= al_register_sample_identifier(".flac", _al_identify_flac);
#endif

#ifdef ALLEGRO_CFG_ACODEC_VORBIS
#ifdef A5O_CFG_ACODEC_VORBIS
ret &= al_register_sample_loader(".ogg", _al_load_ogg_vorbis);
ret &= al_register_audio_stream_loader(".ogg", _al_load_ogg_vorbis_audio_stream);
ret &= al_register_sample_loader_f(".ogg", _al_load_ogg_vorbis_f);
ret &= al_register_audio_stream_loader_f(".ogg", _al_load_ogg_vorbis_audio_stream_f);
ret &= al_register_sample_identifier(".ogg", _al_identify_ogg_vorbis);
#endif

#ifdef ALLEGRO_CFG_ACODEC_OPUS
#ifdef A5O_CFG_ACODEC_OPUS
ret &= al_register_sample_loader(".opus", _al_load_ogg_opus);
ret &= al_register_audio_stream_loader(".opus", _al_load_ogg_opus_audio_stream);
ret &= al_register_sample_loader_f(".opus", _al_load_ogg_opus_f);
ret &= al_register_audio_stream_loader_f(".opus", _al_load_ogg_opus_audio_stream_f);
ret &= al_register_sample_identifier(".opus", _al_identify_ogg_opus);
#endif

#ifdef ALLEGRO_CFG_ACODEC_DUMB
#ifdef A5O_CFG_ACODEC_DUMB
ret &= _al_register_dumb_loaders();
#endif

#ifdef ALLEGRO_CFG_ACODEC_OPENMPT
#ifdef A5O_CFG_ACODEC_OPENMPT
ret &= _al_register_openmpt_loaders();
#endif

/* MP3 will mis-identify a lot of mod files, so put its identifier last */
#ifdef ALLEGRO_CFG_ACODEC_MP3
#ifdef A5O_CFG_ACODEC_MP3
ret &= al_register_sample_loader(".mp3", _al_load_mp3);
ret &= al_register_audio_stream_loader(".mp3", _al_load_mp3_audio_stream);
ret &= al_register_sample_loader_f(".mp3", _al_load_mp3_f);
Expand Down
Loading
Loading