Skip to content

Commit

Permalink
:godmode: fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
htv04 committed Aug 21, 2021
1 parent 4b2c9ab commit 0a61438
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@

*.sh text eol=lf

dependencies/macos/Info.plist text eol=lf
LICENSE text eol=lf
Makefile text eol=lf
28 changes: 14 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
# --------------------------------------------------------------------------------
# Friday Night Funkin' Rewritten Makefile v1.1
#
# Friday Night Funkin' Rewritten Makefile v1.2
#
# Copyright (C) 2021 HTV04
#
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# --------------------------------------------------------------------------------

lovefile:
@rm -rf build/lovefile
@mkdir -p build/lovefile

@cd src/love; zip -r -9 ../../build/lovefile/funkin-rewritten.love .

win64: lovefile
@rm -rf build/win64
@mkdir -p build/win64

@cp resources/win64/love/OpenAL32.dll build/win64
@cp resources/win64/love/SDL2.dll build/win64
@cp resources/win64/love/license.txt build/win64
Expand All @@ -35,13 +35,13 @@ win64: lovefile
@cp resources/win64/love/love.dll build/win64
@cp resources/win64/love/msvcp120.dll build/win64
@cp resources/win64/love/msvcr120.dll build/win64

@cat resources/win64/love/love.exe build/lovefile/funkin-rewritten.love > build/win64/funkin-rewritten.exe

win32: lovefile
@rm -rf build/win32
@mkdir -p build/win32

@cp resources/win32/love/OpenAL32.dll build/win32
@cp resources/win32/love/SDL2.dll build/win32
@cp resources/win32/love/license.txt build/win32
Expand All @@ -50,25 +50,25 @@ win32: lovefile
@cp resources/win32/love/love.dll build/win32
@cp resources/win32/love/msvcp120.dll build/win32
@cp resources/win32/love/msvcr120.dll build/win32

@cat resources/win32/love/love.exe build/lovefile/funkin-rewritten.love > build/win32/funkin-rewritten.exe

macos: lovefile
@rm -rf build/macos
@mkdir -p "build/macos/Friday Night Funkin' Rewritten.app"

@cp -r resources/macos/love.app/. "build/macos/Friday Night Funkin' Rewritten.app"

@cp build/lovefile/funkin-rewritten.love "build/macos/Friday Night Funkin' Rewritten.app/Contents/Resources"

release: lovefile win64 win32 macos
@mkdir -p build/release

@rm -f build/release/funkin-rewritten-lovefile.zip
@rm -f build/release/funkin-rewritten-win64.zip
@rm -f build/release/funkin-rewritten-win32.zip
@rm -f build/release/funkin-rewritten-macos.zip

@cd build/lovefile; zip -9 -r ../release/funkin-rewritten-lovefile.zip .
@cd build/win64; zip -9 -r ../release/funkin-rewritten-win64.zip .
@cd build/win32; zip -9 -r ../release/funkin-rewritten-win32.zip .
Expand Down
4 changes: 2 additions & 2 deletions tools/funkin-xna/funkin-xna.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3

# --------------------------------------------------------------------------------
# Friday Night Funkin' Rewritten Legacy XNA Conversion Helper v1.0
# Friday Night Funkin' Rewritten Legacy XNA Conversion Helper v1.1
#
# Copyright (C) 2021 HTV04
#
Expand Down Expand Up @@ -32,7 +32,7 @@
c = 0
for txtline in txtlines:
c += 1
parsedline = re.match("(.+) = (\d+) (\d+) (\d+) (\d+)", txtline)
parsedline = re.match(r'(.+) = (\d+) (\d+) (\d+) (\d+)', txtline)

name = parsedline.group(1)
x = parsedline.group(2)
Expand Down

0 comments on commit 0a61438

Please sign in to comment.