From 21f83b6d56aba13e472bb3cc286f7f59575693a3 Mon Sep 17 00:00:00 2001 From: cuckydev Date: Wed, 6 Feb 2019 16:41:37 -0500 Subject: [PATCH] Period --- .gitignore | 2 +- Makefile | 15 +++++++-------- src/CommonDefines.h | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b70eefb6..98c0f6ff 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ # Misc /obj Config.dat -Profile.dat +*rofile.dat build.7z build.zip diff --git a/Makefile b/Makefile index cd49268d..65cbfbfd 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,18 @@ ifeq ($(RELEASE), 1) CXXFLAGS := -O3 -s -FILENAME := release +FILENAME ?= release else CXXFLAGS := -O0 -g -FILENAME := debug +FILENAME ?= debug endif ifeq ($(JAPANESE), 1) CXXFLAGS += -DJAPANESE LIBS += -liconv ifeq ($(RELEASE), 1) - FILENAME := releasejp + FILENAME ?= releasejp else - FILENAME := debugjp + FILENAME ?= debugjp endif endif @@ -21,14 +21,13 @@ CXXFLAGS += -DFIX_BUGS endif ifeq ($(WINDOWS), 1) + ifeq ($(CONSOLE), 1) + CXXFLAGS += -mconsole + endif CXXFLAGS += -DWINDOWS LIBS += -lkernel32 endif -ifeq ($(CONSOLE), 1) - CXXFLAGS += -mconsole -endif - CXXFLAGS += `sdl2-config --cflags` `pkg-config freetype2 --cflags` LIBS += `sdl2-config --static-libs` `pkg-config freetype2 --libs` diff --git a/src/CommonDefines.h b/src/CommonDefines.h index ecf6dece..2a135b90 100644 --- a/src/CommonDefines.h +++ b/src/CommonDefines.h @@ -1,5 +1,5 @@ #pragma once #define PATH_LENGTH 260 //Pixel had the path size locked to 260 (dangerously low), if you tried to open the executable in a path with more than around 220 characters, it'd crash. -#define WINDOW_WIDTH ((320*16)/9) -#define WINDOW_HEIGHT 320 +#define WINDOW_WIDTH 320 +#define WINDOW_HEIGHT 240