Browse Source

Merge pull request #4 from ha11owed/master

Update the urls of the modules to prevent errors when initializing the submodules.
Denis Muratshin 6 năm trước cách đây
mục cha
commit
db5b19befe
2 tập tin đã thay đổi với 8 bổ sung8 xóa
  1. 5 5
      .gitmodules
  2. 3 3
      my_awesome_game/project/proj.cmake/run.sh

+ 5 - 5
.gitmodules

@@ -1,15 +1,15 @@
 [submodule "oxygine-framework"]
 	path = libs/oxygine-framework
-	url = [email protected]:oxygine/oxygine-framework.git
+	url = https://github.com/oxygine/oxygine-framework.git
 [submodule "SDL"]
 	path = libs/SDL
-	url = [email protected]:oxygine/SDL2.git
+	url = https://github.com/oxygine/SDL2.git
 [submodule "oxygine-sound"]
 	path = libs/oxygine-sound
-	url = [email protected]:oxygine/oxygine-sound.git
+	url = https://github.com/oxygine/oxygine-sound.git
 [submodule "oxygine-flow"]
 	path = libs/oxygine-flow
-	url = [email protected]:oxygine/oxygine-flow.git
+	url = https://github.com/oxygine/oxygine-flow.git
 [submodule "oxygine-freetype"]
 	path = libs/oxygine-freetype
-	url = [email protected]:oxygine/oxygine-freetype.git
+	url = https://github.com/oxygine/oxygine-freetype.git

+ 3 - 3
my_awesome_game/project/proj.cmake/run.sh

@@ -9,8 +9,8 @@ cmake ..
 #build it
 make
 
-#move to working data folder with resources
-cd ../../data
+#move to working data folder with resources (from the build folder)
+cd ../../../data/
 
 #run executable
-./../proj.cmake/build/my_awesome_game
+./../project/proj.cmake/build/my_awesome_game