Skip to content

Commit

Permalink
rename executable
Browse files Browse the repository at this point in the history
  • Loading branch information
Drewol committed Nov 9, 2018
1 parent d33ca28 commit fb9de11
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ endmacro(enable_cpp11)
macro(set_output_postfixes projectName)
set_target_properties(${projectName} PROPERTIES
OUTPUT_NAME_DEBUG ${projectName}_Debug
OUTPUT_NAME_RELEASE ${projectName}_Release)
OUTPUT_NAME_RELEASE ${projectName})
endmacro(set_output_postfixes)

# Sub-Project directories
Expand Down
36 changes: 18 additions & 18 deletions Main/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,36 @@ enable_precompiled_headers("${Main_src}" stdafx.cpp)
precompiled_header_exclude("Resource.rc")

include_directories(Audio GUI .)
add_executable(Main ${Main_src} ${C_src})
set_output_postfixes(Main)
add_executable(usc-game ${Main_src} ${C_src})
set_output_postfixes(usc-game)

# Target subsystem on windows, set debugging folder
if(MSVC)
set_target_properties(Main PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
set_target_properties(Main PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
set_target_properties(usc-game PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
set_target_properties(usc-game PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
endif(MSVC)

# Dependencies
target_link_libraries(Main Shared)
target_link_libraries(Main Graphics)
target_link_libraries(Main Audio)
target_link_libraries(Main GUI)
target_link_libraries(Main Beatmap)
target_link_libraries(Main nanovg)
target_link_libraries(usc-game Shared)
target_link_libraries(usc-game Graphics)
target_link_libraries(usc-game Audio)
target_link_libraries(usc-game GUI)
target_link_libraries(usc-game Beatmap)
target_link_libraries(usc-game nanovg)
#target_link_libraries(Main nuklear)
target_link_libraries(Main lua)
target_link_libraries(usc-game lua)


if(WIN32)
# Bundled libraries
target_link_libraries(Main zlib)
target_link_libraries(Main freetype)
target_link_libraries(Main SDL2)
target_link_libraries(Main png)
target_link_libraries(Main jpeg)
target_include_directories(Main PUBLIC ${SDL2_SOURCE_DIR}/include/)
target_link_libraries(usc-game zlib)
target_link_libraries(usc-game freetype)
target_link_libraries(usc-game SDL2)
target_link_libraries(usc-game png)
target_link_libraries(usc-game jpeg)
target_include_directories(usc-game PUBLIC ${SDL2_SOURCE_DIR}/include/)
else()
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/third_party/)
include(FindLibraries)
target_link_libraries(Main ${SDL2_LIBRARY})
target_link_libraries(usc-game ${SDL2_LIBRARY})
endif()

0 comments on commit fb9de11

Please sign in to comment.