diff options
| author | Nao Pross <naopross@thearcway.org> | 2018-02-10 14:41:49 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2018-02-10 14:41:49 +0100 |
| commit | d677dbead66c2c52c2ffc51a64ece0a06114d2ad (patch) | |
| tree | 188a7a6fc693dd47de18648577fba3c247361f2c | |
| parent | Implement barebone game engine (diff) | |
| download | Subconscious-old-d677dbead66c2c52c2ffc51a64ece0a06114d2ad.tar.gz Subconscious-old-d677dbead66c2c52c2ffc51a64ece0a06114d2ad.zip | |
Switch to gradle, update gitignore
| -rw-r--r-- | .gitignore | 22 | ||||
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | src/main/java/Actor.java (renamed from src/Actor.java) | 0 | ||||
| -rw-r--r-- | src/main/java/Map.java (renamed from src/Map.java) | 0 | ||||
| -rw-r--r-- | src/main/java/Scene.java (renamed from src/Scene.java) | 0 | ||||
| -rw-r--r-- | src/main/java/Subconscious.java (renamed from src/Subconscious.java) | 0 | ||||
| -rw-r--r-- | src/main/java/Tile.java (renamed from src/Tile.java) | 0 | ||||
| -rw-r--r-- | src/main/java/WorldScene.java (renamed from src/WorldScene.java) | 0 |
9 files changed, 24 insertions, 22 deletions
@@ -1,6 +1,20 @@ -# build files -**/*.class +## OS generated garbage +**/.DS_Store* +**/ehtumbs.db +**/Icon? +**/Thumbs.db + +## Editors +**/*~ +**/*.swp + +## Gradle +target +*/target -# build directories build -jar +*/build + +gradle +.gradle +.m2 @@ -1,18 +1,2 @@ -MAINCLASS := Subconscious - -run: build - cd bin && java $(MAINCLASS) - -pack: build - echo "Main-Class: $(MAINCLASS)" > jar/manifest.txt - jar cvfm jar/$(MAINCLASS).jar jar/manifest.txt -C bin/ . - -build: dirs - javac -d bin/ src/*.java - -dirs: - mkdir -p src bin jar - -clean: - rm jar/* - rm bin/* +all: + gradle run diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..7a06cf2 --- /dev/null +++ b/build.gradle @@ -0,0 +1,4 @@ +apply plugin: 'java' +apply plugin: 'application' + +mainClassName = 'Subconscious' diff --git a/src/Actor.java b/src/main/java/Actor.java index 207d6e6..207d6e6 100644 --- a/src/Actor.java +++ b/src/main/java/Actor.java diff --git a/src/Map.java b/src/main/java/Map.java index 031e922..031e922 100644 --- a/src/Map.java +++ b/src/main/java/Map.java diff --git a/src/Scene.java b/src/main/java/Scene.java index a2949fd..a2949fd 100644 --- a/src/Scene.java +++ b/src/main/java/Scene.java diff --git a/src/Subconscious.java b/src/main/java/Subconscious.java index b63eb23..b63eb23 100644 --- a/src/Subconscious.java +++ b/src/main/java/Subconscious.java diff --git a/src/Tile.java b/src/main/java/Tile.java index cbdeda4..cbdeda4 100644 --- a/src/Tile.java +++ b/src/main/java/Tile.java diff --git a/src/WorldScene.java b/src/main/java/WorldScene.java index 6dff04a..6dff04a 100644 --- a/src/WorldScene.java +++ b/src/main/java/WorldScene.java |