Skip to content

Commit

Permalink
Fix to be compilable in 2023
Browse files Browse the repository at this point in the history
  • Loading branch information
watamario15 committed Dec 22, 2022
1 parent 81f4907 commit 3ca9b09
Show file tree
Hide file tree
Showing 13 changed files with 48,586 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/build.*/*
!Makefile
!Makefile.i
2 changes: 1 addition & 1 deletion TWiki/TWNumber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TWNumber::TWNumber():
m_representations(TWMakeNumberRepresentation((TWNumberInteger)0)){}

TWNumber::TWNumber(bool value):
m_representations(TWMakeNumberRepresentation(value?1LL:0LL)),
m_representations(TWMakeNumberRepresentation((TWNumberInteger)(value?1LL:0LL))),
m_representationType(TWNumberRepresentationTypeInteger){}

TWNumber::TWNumber(TWNumberInteger value):
Expand Down
26 changes: 26 additions & 0 deletions build.cegcc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
SDL=/mnt/c/Users/watamario15/Documents/wata/Git/SDL-1.2/build-wince/.libs
SDLINCLUDE=/mnt/c/Users/watamario15/Documents/wata/Git/SDL-1.2/include
CC=arm-mingw32ce-gcc
CXX=arm-mingw32ce-g++
LD=arm-mingw32ce-g++
STRIP=arm-mingw32ce-strip
WINDRES=arm-mingw32ce-windres
CCFLAGS= -I$(SRCPATH)/tcw/include -I$(SRCPATH) -I$(SDLINCLUDE) -DEV_PLATFORM_WIN32 -DUNICODE -D_UNICODE -DEV_UNSAFE_SWPRINTF -mwin32 -O3 -mcpu=arm926ej-s -D_WIN32_WCE=0x500 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNDEBUG
CXXFLAGS=$(CCFLAGS) --std=gnu++98
LDFLAGS=-L$(SDL) -lSDLmain -lSDL.dll -mwin32 -mthreads -static
TARGET=XTBook.exe


.PHONY: all clean

all: $(TARGET)
clean:
rm -f $(OBJS) $(TARGET) $(PCPREFIXHEADER)

include Makefile.i


$(TARGET): $(OBJS)
$(LD) $(OBJS) -o $(TARGET) $(LDFLAGS)
$(STRIP) $(TARGET)

498 changes: 498 additions & 0 deletions build.cegcc/Makefile.i

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions build.linux/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

CC=gcc
CXX=g++
LD=g++
CCFLAGS= -I$(SRCPATH)/tcw/include -I$(SRCPATH) -I/usr/include/SDL -DEV_PLATFORM_GENERICPOSIX -DUNICODE -D_UNICODE -O3
CXXFLAGS=$(CCFLAGS) --std=gnu++98
LDFLAGS=-lSDLmain -lSDL
TARGET=xtbook


.PHONY: all clean

all: $(TARGET)
clean:
rm -f $(OBJS) $(TARGET)

include Makefile.i


$(TARGET): $(OBJS)
$(LD) $(OBJS) -o $(TARGET) $(LDFLAGS)

496 changes: 496 additions & 0 deletions build.linux/Makefile.i

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions build.mingw32/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@

SDL=/mnt/c/Users/watamario15/Documents/wata/Git/SDL-1.2/build-mingw32/.libs
SDLINCLUDE=/mnt/c/Users/watamario15/Documents/wata/Git/SDL-1.2/include
CC=i686-w64-mingw32-gcc
CXX=i686-w64-mingw32-g++
LD=i686-w64-mingw32-g++
STRIP=i686-w64-mingw32-strip
WINDRES=i686-w64-mingw32-windres
CCFLAGS= -I$(SRCPATH)/tcw/include -I$(SRCPATH) -I$(SDLINCLUDE) -DEV_PLATFORM_WIN32 -DUNICODE -D_UNICODE -DEV_UNSAFE_SWPRINTF -mwin32 -Os -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNDEBUG
CXXFLAGS=$(CCFLAGS) --std=gnu++98
LDFLAGS=-L$(SDL) -lmingw32 -lSDLmain -lSDL.dll -mwindows -lm -luser32 -lgdi32 -lwinmm -static -lstdc++
TARGET=XTBook.exe


.PHONY: all clean

all: $(TARGET)
clean:
rm -f $(OBJS) $(TARGET) $(PCSDLHEADER)

include Makefile.i


$(TARGET): $(OBJS)
$(LD) $(OBJS) -o $(TARGET) $(LDFLAGS)
$(STRIP) $(TARGET)

498 changes: 498 additions & 0 deletions build.mingw32/Makefile.i

Large diffs are not rendered by default.

47,011 changes: 47,011 additions & 0 deletions data/XTBHGGothicData.c

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tcw/graphics/twSDLDC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#endif

#if USE_SDL_IMAGE
#include <SDL/SDL_image.h>
#include <SDL_image.h>
#endif
#include <tcw/twException.h>
#include <tcw/twSDLDC.h>
Expand Down
2 changes: 1 addition & 1 deletion tcw/include/tcw/twApp.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#pragma once

#include <SDL/SDL.h>
#include <SDL.h>
#include <tcw/twTypes.h>
#include <wchar.h>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion tcw/include/tcw/twSDLDC.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma once

#include <tcw/twDC.h>
#include <SDL/SDL.h>
#include <SDL.h>
#include <wchar.h>
#include <string>
#include <tcw/twTimer.h>
Expand Down
2 changes: 1 addition & 1 deletion tcw/include/tcw/twSDLEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#pragma once

#include <SDL/SDL.h>
#include <SDL.h>
#include <tcw/twEvent.h>
#include <tcw/twTypes.h>
#include <wchar.h>
Expand Down

0 comments on commit 3ca9b09

Please sign in to comment.