Skip to content

Commit

Permalink
Remove femain.cpp
Browse files Browse the repository at this point in the history
This is made to simplify linking on MinGW. For more info, see:
emlai#3 (comment)
  • Loading branch information
emlai committed Sep 15, 2016
1 parent b63c769 commit a84eef8
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 68 deletions.
61 changes: 0 additions & 61 deletions FeLib/Source/femain.cpp

This file was deleted.

3 changes: 1 addition & 2 deletions Main/Source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
#include "script.h"
#include "message.h"
#include "proto.h"

#include "audio.h"

int Main(int argc, char **argv)
int main(int argc, char** argv)
{
if(argc > 1 && festring(argv[1]) == "--version")
{
Expand Down
2 changes: 1 addition & 1 deletion igor/Source/igor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define TILE_SIZE 16
cv2 TILE_V2(TILE_SIZE, TILE_SIZE);

int Main(int, char**)
int main(int, char**)
{
festring OldDirectory;
std::ifstream IConfigFile("igor.cfg");
Expand Down
2 changes: 1 addition & 1 deletion igordj.mak
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
AR = ar rs
CC = gxx -o
FeLibDIR = FeLib
FeLibOBJ = $(FeLibDIR)/Source/bitmap.o $(FeLibDIR)/Source/colorbit.o $(FeLibDIR)/Source/error.o $(FeLibDIR)/Source/feio.o $(FeLibDIR)/Source/felist.o $(FeLibDIR)/Source/femain.o $(FeLibDIR)/Source/femath.o $(FeLibDIR)/Source/festring.o $(FeLibDIR)/Source/graphics.o $(FeLibDIR)/Source/hscore.o $(FeLibDIR)/Source/save.o $(FeLibDIR)/Source/whandler.o
FeLibOBJ = $(FeLibDIR)/Source/bitmap.o $(FeLibDIR)/Source/colorbit.o $(FeLibDIR)/Source/error.o $(FeLibDIR)/Source/feio.o $(FeLibDIR)/Source/felist.o $(FeLibDIR)/Source/femath.o $(FeLibDIR)/Source/festring.o $(FeLibDIR)/Source/graphics.o $(FeLibDIR)/Source/hscore.o $(FeLibDIR)/Source/save.o $(FeLibDIR)/Source/whandler.o
IGORDIR = Igor
IGORBIN = IGOR.exe
IGOROBJ = $(IGORDIR)/Source/igor.o
Expand Down
2 changes: 1 addition & 1 deletion ivandj.mak
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

CC = gxx -o
FeLibDIR = FeLib
FeLibOBJ = $(FeLibDIR)/Source/bitmap.o $(FeLibDIR)/Source/config.o $(FeLibDIR)/Source/error.o $(FeLibDIR)/Source/feio.o $(FeLibDIR)/Source/felist.o $(FeLibDIR)/Source/femain.o $(FeLibDIR)/Source/femath.o $(FeLibDIR)/Source/festring.o $(FeLibDIR)/Source/fetime.o $(FeLibDIR)/Source/graphics.o $(FeLibDIR)/Source/hscore.o $(FeLibDIR)/Source/rawbit.o $(FeLibDIR)/Source/save.o $(FeLibDIR)/Source/whandler.o
FeLibOBJ = $(FeLibDIR)/Source/bitmap.o $(FeLibDIR)/Source/config.o $(FeLibDIR)/Source/error.o $(FeLibDIR)/Source/feio.o $(FeLibDIR)/Source/felist.o $(FeLibDIR)/Source/femath.o $(FeLibDIR)/Source/festring.o $(FeLibDIR)/Source/fetime.o $(FeLibDIR)/Source/graphics.o $(FeLibDIR)/Source/hscore.o $(FeLibDIR)/Source/rawbit.o $(FeLibDIR)/Source/save.o $(FeLibDIR)/Source/whandler.o
IVANDIR = Main
IVANBIN = IVAN.exe
IVANOBJ = $(IVANDIR)/Source/actset.o $(IVANDIR)/Source/areaset.o $(IVANDIR)/Source/charset.o $(IVANDIR)/Source/charsset.o $(IVANDIR)/Source/command.o $(IVANDIR)/Source/coreset.o $(IVANDIR)/Source/dataset.o $(IVANDIR)/Source/dungeon.o $(IVANDIR)/Source/game.o $(IVANDIR)/Source/godset.o $(IVANDIR)/Source/iconf.o $(IVANDIR)/Source/id.o $(IVANDIR)/Source/igraph.o $(IVANDIR)/Source/itemset.o $(IVANDIR)/Source/levelset.o $(IVANDIR)/Source/main.o $(IVANDIR)/Source/materset.o $(IVANDIR)/Source/message.o $(IVANDIR)/Source/object.o $(IVANDIR)/Source/roomset.o $(IVANDIR)/Source/script.o $(IVANDIR)/Source/slotset.o $(IVANDIR)/Source/trapset.o $(IVANDIR)/Source/wmapset.o $(IVANDIR)/Source/wskill.o
Expand Down
2 changes: 1 addition & 1 deletion mihail/Source/mihail.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
truth DebugDraw(festring Filename);
int OutputHTML(festring);

int Main(int argc, char** argv)
int main(int argc, char** argv)
{
if(argc == 3)
{
Expand Down
2 changes: 1 addition & 1 deletion mihaildj.mak
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
AR = ar rs
CC = gxx -o
FeLibDIR = FeLib
FeLibOBJ = $(FeLibDIR)/Source/bitmap.o $(FeLibDIR)/Source/colorbit.o $(FeLibDIR)/Source/error.o $(FeLibDIR)/Source/feio.o $(FeLibDIR)/Source/felist.o $(FeLibDIR)/Source/femain.o $(FeLibDIR)/Source/femath.o $(FeLibDIR)/Source/festring.o $(FeLibDIR)/Source/graphics.o $(FeLibDIR)/Source/hscore.o $(FeLibDIR)/Source/save.o $(FeLibDIR)/Source/whandler.o
FeLibOBJ = $(FeLibDIR)/Source/bitmap.o $(FeLibDIR)/Source/colorbit.o $(FeLibDIR)/Source/error.o $(FeLibDIR)/Source/feio.o $(FeLibDIR)/Source/felist.o $(FeLibDIR)/Source/femath.o $(FeLibDIR)/Source/festring.o $(FeLibDIR)/Source/graphics.o $(FeLibDIR)/Source/hscore.o $(FeLibDIR)/Source/save.o $(FeLibDIR)/Source/whandler.o
MIHAILDIR = MIHAIL
MIHAILBIN = MIHAIL.exe
MIHAILOBJ = $(MIHAILDIR)/Source/mihail.o
Expand Down

0 comments on commit a84eef8

Please sign in to comment.