Skip to content

Commit 4731ae8

Browse files
committed
Update forge2d_game for flutter beta
1 parent cfa0d5a commit 4731ae8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+392
-482
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

forge2d_game/step_02/linux/CMakeLists.txt

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Project-level configuration.
2-
cmake_minimum_required(VERSION 3.13)
2+
cmake_minimum_required(VERSION 3.10)
33
project(runner LANGUAGES CXX)
44

55
# The name of the executable created for the application. Change this to change
@@ -54,8 +54,25 @@ add_subdirectory(${FLUTTER_MANAGED_DIR})
5454
find_package(PkgConfig REQUIRED)
5555
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
5656

57-
# Application build; see runner/CMakeLists.txt.
58-
add_subdirectory("runner")
57+
add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
58+
59+
# Define the application target. To change its name, change BINARY_NAME above,
60+
# not the value here, or `flutter run` will no longer work.
61+
#
62+
# Any new source files that you add to the application should be added here.
63+
add_executable(${BINARY_NAME}
64+
"main.cc"
65+
"my_application.cc"
66+
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
67+
)
68+
69+
# Apply the standard set of build settings. This can be removed for applications
70+
# that need different build settings.
71+
apply_standard_settings(${BINARY_NAME})
72+
73+
# Add dependency libraries. Add any application-specific dependencies here.
74+
target_link_libraries(${BINARY_NAME} PRIVATE flutter)
75+
target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
5976

6077
# Run the Flutter tool portions of the build. This must not be removed.
6178
add_dependencies(${BINARY_NAME} flutter_assemble)
File renamed without changes.

forge2d_game/step_04/linux/runner/my_application.cc renamed to forge2d_game/step_02/linux/my_application.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ static void my_application_class_init(MyApplicationClass* klass) {
117117
static void my_application_init(MyApplication* self) {}
118118

119119
MyApplication* my_application_new() {
120-
// Set the program name to the application ID, which helps various systems
121-
// like GTK and desktop environments map this running application to its
122-
// corresponding .desktop file. This ensures better integration by allowing
123-
// the application to be recognized beyond its binary name.
124-
g_set_prgname(APPLICATION_ID);
125-
126120
return MY_APPLICATION(g_object_new(my_application_get_type(),
127121
"application-id", APPLICATION_ID,
128122
"flags", G_APPLICATION_NON_UNIQUE,

forge2d_game/step_02/linux/runner/CMakeLists.txt

Lines changed: 0 additions & 26 deletions
This file was deleted.

forge2d_game/step_02/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ dependencies:
1010
flutter:
1111
sdk: flutter
1212
characters: ^1.3.0
13-
flame: ^1.20.0
13+
flame: ^1.21.0
1414
flame_forge2d: ^0.18.2+1
1515
flame_kenney_xml: ^0.1.1+1
1616
xml: ^6.5.0
1717

1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
21-
flutter_lints: ^5.0.0
21+
flutter_lints: ^4.0.0
2222

2323
flutter:
2424
uses-material-design: true

forge2d_game/step_02/web/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<meta name="description" content="A new Flutter project.">
2222

2323
<!-- iOS meta tags & icons -->
24-
<meta name="mobile-web-app-capable" content="yes">
24+
<meta name="apple-mobile-web-app-capable" content="yes">
2525
<meta name="apple-mobile-web-app-status-bar-style" content="black">
2626
<meta name="apple-mobile-web-app-title" content="forge2d_game">
2727
<link rel="apple-touch-icon" href="icons/Icon-192.png">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

forge2d_game/step_03/linux/CMakeLists.txt

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Project-level configuration.
2-
cmake_minimum_required(VERSION 3.13)
2+
cmake_minimum_required(VERSION 3.10)
33
project(runner LANGUAGES CXX)
44

55
# The name of the executable created for the application. Change this to change
@@ -54,8 +54,25 @@ add_subdirectory(${FLUTTER_MANAGED_DIR})
5454
find_package(PkgConfig REQUIRED)
5555
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
5656

57-
# Application build; see runner/CMakeLists.txt.
58-
add_subdirectory("runner")
57+
add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
58+
59+
# Define the application target. To change its name, change BINARY_NAME above,
60+
# not the value here, or `flutter run` will no longer work.
61+
#
62+
# Any new source files that you add to the application should be added here.
63+
add_executable(${BINARY_NAME}
64+
"main.cc"
65+
"my_application.cc"
66+
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
67+
)
68+
69+
# Apply the standard set of build settings. This can be removed for applications
70+
# that need different build settings.
71+
apply_standard_settings(${BINARY_NAME})
72+
73+
# Add dependency libraries. Add any application-specific dependencies here.
74+
target_link_libraries(${BINARY_NAME} PRIVATE flutter)
75+
target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
5976

6077
# Run the Flutter tool portions of the build. This must not be removed.
6178
add_dependencies(${BINARY_NAME} flutter_assemble)

0 commit comments

Comments
 (0)