Skip to content

Commit

Permalink
Support mingw64 compiler - reorder library order for samples in order…
Browse files Browse the repository at this point in the history
… to compile (other compilers don't care and work with both library orders)
  • Loading branch information
Irdis committed Apr 26, 2022
1 parent 0de0b16 commit b677812
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Extensions/Terrain/Sample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ else()
endif()

if(HORDE3D_USE_GLFW)
target_link_libraries(Terrain Horde3D Horde3DUtils SampleFramework ${GLFW_LIBRARIES})
target_link_libraries(Terrain SampleFramework Horde3D Horde3DUtils ${GLFW_LIBRARIES})
elseif(HORDE3D_USE_SDL)
target_link_libraries(Terrain Horde3D Horde3DUtils SampleFramework ${SDL2_LIBRARY})
target_link_libraries(Terrain SampleFramework Horde3D Horde3DUtils ${SDL2_LIBRARY})
endif()

add_dependencies(Terrain SampleFramework)
Expand Down
4 changes: 2 additions & 2 deletions Horde3D/Samples/Chicago/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ else()
endif()

if(HORDE3D_USE_GLFW)
target_link_libraries(Chicago Horde3D Horde3DUtils SampleFramework ${GLFW_LIBRARIES})
target_link_libraries(Chicago SampleFramework Horde3D Horde3DUtils ${GLFW_LIBRARIES})
elseif(HORDE3D_USE_SDL)
target_link_libraries(Chicago Horde3D Horde3DUtils SampleFramework ${SDL2_LIBRARY})
target_link_libraries(Chicago SampleFramework Horde3D Horde3DUtils ${SDL2_LIBRARY})
endif()

add_dependencies(Chicago SampleFramework)
4 changes: 2 additions & 2 deletions Horde3D/Samples/Knight/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ else()
endif()

if(HORDE3D_USE_GLFW)
target_link_libraries(Knight Horde3D Horde3DUtils SampleFramework ${GLFW_LIBRARIES})
target_link_libraries(Knight SampleFramework Horde3D Horde3DUtils ${GLFW_LIBRARIES})
elseif(HORDE3D_USE_SDL)
target_link_libraries(Knight Horde3D Horde3DUtils SampleFramework ${SDL2_LIBRARY})
target_link_libraries(Knight SampleFramework Horde3D Horde3DUtils ${SDL2_LIBRARY})
endif()

add_dependencies(Knight SampleFramework)
Expand Down
4 changes: 2 additions & 2 deletions Horde3D/Samples/ParticleVortex/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ endif()
#set_property(TARGET ParticleVortex PROPERTY CXX_STANDARD 11)

if(HORDE3D_USE_GLFW)
target_link_libraries(ParticleVortex Horde3D Horde3DUtils SampleFramework ${GLFW_LIBRARIES})
target_link_libraries(ParticleVortex SampleFramework Horde3D Horde3DUtils ${GLFW_LIBRARIES})
elseif(HORDE3D_USE_SDL)
target_link_libraries(ParticleVortex Horde3D Horde3DUtils SampleFramework ${SDL2_LIBRARY})
target_link_libraries(ParticleVortex SampleFramework Horde3D Horde3DUtils ${SDL2_LIBRARY})
endif()

add_dependencies(ParticleVortex SampleFramework)
Expand Down
4 changes: 2 additions & 2 deletions Horde3D/Samples/Tessellator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ endif()
#set_property(TARGET Tessellator PROPERTY CXX_STANDARD 11)

if(HORDE3D_USE_GLFW)
target_link_libraries(Tessellator Horde3D Horde3DUtils SampleFramework ${GLFW_LIBRARIES})
target_link_libraries(Tessellator SampleFramework Horde3D Horde3DUtils ${GLFW_LIBRARIES})
elseif(HORDE3D_USE_SDL)
target_link_libraries(Tessellator Horde3D Horde3DUtils SampleFramework ${SDL2_LIBRARY})
target_link_libraries(Tessellator SampleFramework Horde3D Horde3DUtils ${SDL2_LIBRARY})
endif()

add_dependencies(Tessellator SampleFramework)
Expand Down

0 comments on commit b677812

Please sign in to comment.