version 1.4.0

No warnings on Linux with 'make release'
Rangi42 · Sep 25, 2017 · dfa33f4 · dfa33f4
1 parent 3074535
commit dfa33f4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 46 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -22,51 +22,10 @@ chmod +x configure
 ./configure --with-abiversion=10304
 sudo make
 sudo make install
+mkdir ../linux
 cp lib/*.a ../linux
 
 cd ../..
 
 make install
 ```
-
-To build **polishedcrystal.gbc**:
-
-```bash
-make
-```
-
-To build other versions:
-
-```bash
-make [faithful] [nortc] [monochrome] [debug]
-```
-
-
-## Mac OS X
-
-In **Terminal**, run:
-
-```bash
-xcode-select --install
-
-git clone https://github.com/rednex/rgbds.git
-cd rgbds
-git checkout v0.3.1
-sudo make install
-cd ..
-
-git clone https://github.com/roukaour/polishedcrystal.git
-cd polishedcrystal
-```
-
-To build **polishedcrystal.gbc**:
-
-```bash
-make
-```
-
-To build other versions:
-
-```bash
-make [faithful] [nortc] [monochrome] [debug]
-```
diff --git a/Makefile b/Makefile
@@ -72,3 +72,5 @@ clean:
 
 install: release
 	cp $(TARGET) /usr/local/bin/$(BINNAME)
+	cp $(RESDIR)/app.xpm /usr/share/pixmaps/polishedmap48.xpm
+	cp $(RESDIR)/app-icon.xpm /usr/share/pixmaps/polishedmap16.xpm
diff --git a/src/main-window.cpp b/src/main-window.cpp
@@ -365,7 +365,7 @@ void Main_Window::update_status(Block *b) {
 	}
 	char buffer[64] = {};
 	if (!b) {
-		sprintf(buffer, "Metatiles: %d", _metatileset.size());
+		sprintf(buffer, "Metatiles: %lu", _metatileset.size());
 		_metatile_count->copy_label(buffer);
 		sprintf(buffer, "Map: %d x %d", _map.width(), _map.height());
 		_map_dimensions->copy_label(buffer);

diff --git a/src/version.h b/src/version.h
@@ -1,11 +1,11 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define PROGRAM_VERSION 1,3,1
+#define PROGRAM_VERSION 1,4,0
 #ifdef _DEBUG
-#define PROGRAM_VERSION_STRING "1.3.1 [DEBUG]"
+#define PROGRAM_VERSION_STRING "1.4.0 [DEBUG]"
 #else
-#define PROGRAM_VERSION_STRING "1.3.1"
+#define PROGRAM_VERSION_STRING "1.4.0"
 #endif
 
 #define PROGRAM_NAME "Polished Map"