latest code update

- app icon
- starting with map view
- code cleanup

Signed-off-by: Peter Siegmund <mars3142@noreply.mars3142.dev>

CMakeLists.txt

@@ -27,21 +27,25 @@ FetchContent_MakeAvailable(wxWidgets)
 message(STATUS "Configure project....")
 
 set(SRCS
-        main/src/main.cpp
         main/src/app.cpp
-        main/src/ui/start_screen.cpp
+        main/src/main.cpp
         main/src/ui/game_screen.cpp
+        main/src/ui/map_sim_frame.cpp
+        main/src/ui/start_screen.cpp
         main/src/ui/wherigo_dialog.cpp
-        main/src/lua/wherigo.cpp
-        main/src/lua/zobject.cpp
-        main/src/lua/ztimer.cpp
         main/src/lua/game_engine.cpp
         main/src/lua/media_manager.cpp
         main/src/lua/persistence.cpp
+        main/src/lua/wherigo.cpp
         main/src/lua/wherigo_completion.cpp
+        main/src/lua/zobject.cpp
+        main/src/lua/ztimer.cpp
 )
 
 if (APPLE)
+    configure_file(${CMAKE_SOURCE_DIR}/assets/Info.plist.in
+                   ${CMAKE_BINARY_DIR}/Info.plist @ONLY)
+    set(MACOSX_BUNDLE_ICON_FILE icon.icns)
     add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${SRCS})
     set_target_properties(${PROJECT_NAME} PROPERTIES
             BUNDLE True
@@ -49,7 +53,8 @@ if (APPLE)
             MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}
             MACOSX_BUNDLE_BUNDLE_VERSION "0.1"
             MACOSX_BUNDLE_SHORT_VERSION_STRING "0.1"
-            #MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/customtemplate.plist.in
+            MACOSX_BUNDLE_ICON_FILE icon.icns
+            MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/Info.plist
             INSTALL_RPATH "@executable_path"
     )
 else ()
@@ -61,14 +66,14 @@ include_directories(main/include)
 
 target_link_libraries(${PROJECT_NAME}
         PRIVATE
-        wxcore
-        wxnet
-        wxbase
-        wxhtml
+        wx::net
+        wx::html
+        wx::webview
         lua
         cartridge
         storage
 )
+target_include_directories(${PROJECT_NAME} PRIVATE ${wxWidgets_INCLUDE_DIRS})
 
 # Kopiere die .dylib-Dateien ins Bundle
 if (APPLE)
@@ -78,5 +83,11 @@ if (APPLE)
             $<TARGET_FILE:cartridge>
             $<TARGET_FILE:storage>
             "$<TARGET_BUNDLE_DIR:${PROJECT_NAME}>/Contents/MacOS/"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            ${CMAKE_SOURCE_DIR}/assets/icon.icns
+            "$<TARGET_BUNDLE_DIR:${PROJECT_NAME}>/Contents/Resources/icon.icns"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            ${CMAKE_BINARY_DIR}/Info.plist
+            "$<TARGET_BUNDLE_DIR:${PROJECT_NAME}>/Contents/Info.plist"
     )
 endif ()