t

Fix generator expressions showing up in pkgconfig files

Instead of using these expressions, adding "lib" in fron of static libs is now done via CMAKE_STATIC_LIBRARY_PREFIX when building static libs on Windows.

changed order of includes in projectM-Test-UI so that it could be built

removed git modules file

deleted frontend-qt folder

made changes to pmSDL.hpp in order to fix build errors related to order of included windows libraries. Also added line in .gitignore to avoid pushing dependencies installed via vcpkg

added original .gitmodules file back, removing submodules

added original .gitmodules file back, removing submodules

.gitignore

@@ -54,6 +54,7 @@ to_sync/
 src/projectM-sdl/build/
 src/libprojectM/build/
 *.pkg
+./vcpkg_installed
 
 # CLion
 cmake-build-*

CMakeLists.txt

@@ -82,6 +82,11 @@ else()
             )
 endif()
 
+if(NOT BUILD_SHARED_LIBS AND CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    # Add "lib" in front of static library files to allow installing both shared and static libs in the same dir.
+    set(CMAKE_STATIC_LIBRARY_PREFIX lib)
+endif()
+
 if(ENABLE_EMSCRIPTEN)
     message(STATUS "${CMAKE_C_COMPILER} on ${CMAKE_SYSTEM_NAME}")
     check_symbol_exists(__EMSCRIPTEN__ "" HAVE_EMSCRIPTEN)

src/libprojectM/CMakeLists.txt

@@ -129,7 +129,7 @@ else()
             )
 
     set_target_properties(projectM PROPERTIES
-            OUTPUT_NAME $<IF:$<PLATFORM_ID:Windows>,lib${PROJECTM_LIBRARY_BASE_OUTPUT_NAME},${PROJECTM_LIBRARY_BASE_OUTPUT_NAME}>
+            OUTPUT_NAME ${PROJECTM_LIBRARY_BASE_OUTPUT_NAME}
             FOLDER libprojectM
             )
 endif()

src/playlist/CMakeLists.txt

@@ -75,7 +75,7 @@ else()
             )
 
     set_target_properties(projectM_playlist PROPERTIES
-            OUTPUT_NAME $<IF:$<PLATFORM_ID:Windows>,lib${PROJECTM_LIBRARY_BASE_OUTPUT_NAME}-playlist,${PROJECTM_LIBRARY_BASE_OUTPUT_NAME}-playlist>
+            OUTPUT_NAME ${PROJECTM_LIBRARY_BASE_OUTPUT_NAME}-playlist
             FOLDER libprojectM
             )
 endif()

src/sdl-test-ui/pmSDL.hpp

@@ -61,13 +61,16 @@
 #include <sys/stat.h>
 
 #ifdef WASAPI_LOOPBACK
+#include <windows.h>
+#include <mmdeviceapi.h>
 #include <audioclient.h>
-#include <avrt.h>
+
 #include <functiondiscoverykeys_devpkey.h>
-#include <mmdeviceapi.h>
+#include <avrt.h>
+
 #include <mmsystem.h>
 #include <stdio.h>
-#include <windows.h>
+
 
 #define LOG(format, ...) wprintf(format L"\n", __VA_ARGS__)
 #define ERR(format, ...) LOG(L"Error: " format, __VA_ARGS__)