mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2025-12-22 07:10:25 -08:00
Partially revert previous commits; ensure the bundle is fixed up correctly
This commit is contained in:
@@ -183,9 +183,7 @@ add_custom_command(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
# this needs to be relative
|
set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/cockatrice.app/Contents/Plugins)
|
||||||
set(plugin_dest_dir ./cockatrice.app/Contents/Plugins)
|
|
||||||
# instead, this needs an absolute path (for make package to work)
|
|
||||||
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/cockatrice.app/Contents/Resources)
|
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/cockatrice.app/Contents/Resources)
|
||||||
|
|
||||||
# note: no codecs in qt5
|
# note: no codecs in qt5
|
||||||
|
|||||||
@@ -48,9 +48,7 @@ IF (NOT WIN32 AND NOT APPLE)
|
|||||||
ENDIF (NOT WIN32 AND NOT APPLE)
|
ENDIF (NOT WIN32 AND NOT APPLE)
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
# this needs to be relative
|
set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Plugins)
|
||||||
set(plugin_dest_dir ./oracle.app/Contents/Plugins)
|
|
||||||
# instead, this needs an absolute path (for make)
|
|
||||||
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Resources)
|
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Resources)
|
||||||
|
|
||||||
# note: no codecs in qt5
|
# note: no codecs in qt5
|
||||||
|
|||||||
@@ -55,9 +55,7 @@ elseif(WIN32)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
# this needs to be relative
|
set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/servatrice.app/Contents/Plugins)
|
||||||
set(plugin_dest_dir ./servatrice.app/Contents/Plugins)
|
|
||||||
# instead, this needs an absolute path (for make)
|
|
||||||
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/servatrice.app/Contents/Resources)
|
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/servatrice.app/Contents/Resources)
|
||||||
|
|
||||||
# note: no codecs in qt5
|
# note: no codecs in qt5
|
||||||
|
|||||||
Reference in New Issue
Block a user