From 8749ddc3da9574c2406a7dfd2fd6a4639148beef Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Mon, 23 Sep 2019 12:33:43 +0300 Subject: Set "-no-pie" to all executables built by GCC Otherwise, this happens: https://stackoverflow.com/questions/46551213/gcc-7-2-compiles-shared-library-instead-of-executable --- utils/adlmidi-2/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'utils/adlmidi-2') diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index 8390a95..3b9c4f3 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -29,6 +29,10 @@ if(NOT WIN32 AND NOT ADLMIDI_DOS) target_link_libraries(adlmidi2 PRIVATE ADLMIDI_SDL2) endif() +if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + set_property(TARGET adlmidi2 APPEND_STRING PROPERTY LINK_FLAGS " -no-pie") +endif() + if(ADLMIDI2_HAS_PUZZLE_GAME) target_compile_definitions(adlmidi2 PUBLIC SUPPORT_PUZZLE_GAME) endif() -- cgit v1.2.3 From 22248f90dd83413e91c8d4b66e652ef1a7954b60 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Mon, 23 Sep 2019 12:51:19 +0300 Subject: Don't call "-no-pie" when it's unavailable --- utils/adlmidi-2/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'utils/adlmidi-2') diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index 3b9c4f3..02351fa 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -29,9 +29,7 @@ if(NOT WIN32 AND NOT ADLMIDI_DOS) target_link_libraries(adlmidi2 PRIVATE ADLMIDI_SDL2) endif() -if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - set_property(TARGET adlmidi2 APPEND_STRING PROPERTY LINK_FLAGS " -no-pie") -endif() +set_nopie(adlmidi2) if(ADLMIDI2_HAS_PUZZLE_GAME) target_compile_definitions(adlmidi2 PUBLIC SUPPORT_PUZZLE_GAME) -- cgit v1.2.3 From 7ff1f8b9522d132c9248a68cc5df15e841523ea6 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Mon, 23 Sep 2019 17:55:22 +0300 Subject: MidiPlay: Move Audio Output into separate module --- utils/adlmidi-2/midiplay.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'utils/adlmidi-2') diff --git a/utils/adlmidi-2/midiplay.cc b/utils/adlmidi-2/midiplay.cc index f51c20d..3cb35a0 100644 --- a/utils/adlmidi-2/midiplay.cc +++ b/utils/adlmidi-2/midiplay.cc @@ -1499,8 +1499,13 @@ static int ParseCommandLine(char *cmdline, char **argv) } extern int main(int argc, char **argv); + int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) { + (void)hInst; + (void)hPrev; + (void)szCmdLine; + (void)sw; //extern int main(int, char **); char *cmdline = GetCommandLine(); int argc = ParseCommandLine(cmdline, NULL); -- cgit v1.2.3