Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions THEMES.md
Original file line number Diff line number Diff line change
Expand Up @@ -871,12 +871,17 @@ EmulationStation borrows the concept of "nine patches" from Android (or "9-Slice
* `origin` - type: NORMALIZED_PAIR.
- Where on the carousel `pos` refers to. For example, an origin of `0.5 0.5` and a `pos` of `0.5 0.5` would place the carousel exactly in the middle of the screen. If the "POSITION" and "SIZE" attributes are themable, "ORIGIN" is implied.
* `color` - type: COLOR.
- Controls the color of the carousel background.
- Default is FFFFFFD8
- Controls the color of the carousel background.
- Default is FFFFFFD8
* `colorEnd` - type: COLOR.
- Optional end color when drawing a gradient background.
- Defaults to the same value as `color`.
* `gradientType` - type: STRING.
- Sets the gradient direction. Accepted values are "horizontal" (default) or "vertical".
* `logoSize` - type: NORMALIZED_PAIR. Default is "0.25 0.155"
* `logoScale` - type: FLOAT.
- Selected logo is increased in size by this scale
- Default is 1.2
- Selected logo is increased in size by this scale
- Default is 1.2
* `logoRotation` - type: FLOAT.
- Angle in degrees that the logos should be rotated. Value should be positive.
- Default is 7.5
Expand All @@ -890,10 +895,16 @@ EmulationStation borrows the concept of "nine patches" from Android (or "9-Slice
- Accepted values are "left", "right" or "center" when `type` is "vertical" or "vertical_wheel".
- Default is "center"
* `maxLogoCount` - type: FLOAT.
- Sets the number of logos to display in the carousel.
- Default is 3
- Sets the number of logos to display in the carousel.
- Default is 3
* `minLogoOpacity` - type: FLOAT.
- Sets a minimum opacity for unfocused logos (0.0 - 1.0). Default is 0.5.
* `scaledLogoSpacing` - type: FLOAT.
- Adds extra spacing when scaled logos overlap. Set to 0 for classic behaviour. Default is 0.
* `zIndex` - type: FLOAT.
- z-index value for component. Components will be rendered in order of z-index value from low to high.
- z-index value for component. Components will be rendered in order of z-index value from low to high.
* `scrollSound` - type: PATH.
- Optional sound played while scrolling the system carousel.

The help system is a special element that displays a context-sensitive list of actions the user can take at any time. You should try and keep the position constant throughout every screen. Keep in mind the "default" settings (including position) are used whenever the user opens a menu.

Expand Down
35 changes: 20 additions & 15 deletions es-app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ set(ES_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.h
${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreenSaver.h
${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemManager.h
${CMAKE_CURRENT_SOURCE_DIR}/src/LocaleES.h
${CMAKE_CURRENT_SOURCE_DIR}/src/ThemeOptions.h
${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiThemeOptions.h

# 🔊 Background music
${CMAKE_CURRENT_SOURCE_DIR}/src/audio/BackgroundMusicManager.h

# GuiComponents
${CMAKE_CURRENT_SOURCE_DIR}/src/components/AsyncReqComponent.h
Expand Down Expand Up @@ -73,6 +79,15 @@ set(ES_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreenSaver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemManager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/LocaleES.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/ThemeOptions.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiThemeOptions.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiThemeOptions.h


# 🔊 Background music
${CMAKE_CURRENT_SOURCE_DIR}/src/audio/BackgroundMusicManager.cpp


# GuiComponents
${CMAKE_CURRENT_SOURCE_DIR}/src/components/AsyncReqComponent.cpp
Expand Down Expand Up @@ -115,36 +130,25 @@ set(ES_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.cpp
)

#-------------------------------------------------------------------------------
# define OS specific sources and headers
if(MSVC)
LIST(APPEND ES_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/EmulationStation.rc
)
endif()

#-------------------------------------------------------------------------------
# define target
include_directories(${COMMON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/src)
add_executable(emulationstation ${ES_SOURCES} ${ES_HEADERS})
target_link_libraries(emulationstation ${COMMON_LIBRARIES} es-core)

# special properties for Windows builds
# 🔗 añadimos SDL2_mixer para la música de fondo
target_link_libraries(emulationstation ${COMMON_LIBRARIES} es-core SDL2_mixer)

if(MSVC)
# Always compile with the "WINDOWS" subsystem to avoid console window flashing at startup
# when --debug is not set (see es-core/src/main.cpp for explanation).
# The console will still be shown if launched with --debug.
# Note that up to CMake 2.8.10 this feature is broken: http://public.kitware.com/Bug/view.php?id=12566
set_target_properties(emulationstation PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
set_target_properties(emulationstation PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS")
set_target_properties(emulationstation PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
set_target_properties(emulationstation PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
endif()


#-------------------------------------------------------------------------------
# set up CPack install stuff so `make install` does something useful

install(TARGETS emulationstation
RUNTIME
DESTINATION bin)
Expand All @@ -154,7 +158,8 @@ INCLUDE(InstallRequiredSystemLibraries)
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A flexible graphical emulator front-end")
SET(CPACK_PACKAGE_DESCRIPTION "EmulationStation is a flexible, graphical front-end designed for keyboardless navigation of your multi-platform retro game collection.")

SET(CPACK_RESOURCE_FILE LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
# 🔹 CORRECCIÓN: se mueve el LICENSE.md a la raíz del proyecto
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.md")
SET(CPACK_RESOURCE_FILE README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")

SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Alec Lofquist <allofquist@yahoo.com>")
Expand Down
Loading