Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
igagis committed Jan 21, 2024
1 parent 2aeb413 commit 3ca5acd
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
implementation 'io.github.cppfw:papki:+'
implementation 'io.github.cppfw:nitki:+'
implementation 'io.github.cppfw:morda:+'
implementation 'io.github.cppfw:morda-render-opengles:+'
implementation 'io.github.cppfw:ruis-render-opengles:+'
implementation project(path: ':mordavokne', configuration: 'default')
}

Expand Down
2 changes: 1 addition & 1 deletion android/mordavokne-$(version).pom.in
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>io.github.cppfw</groupId>
<artifactId>morda-render-opengles</artifactId>
<artifactId>ruis-render-opengles</artifactId>
<version>[0.1.37,)</version>
<type>aar</type>
<scope>compile</scope>
Expand Down
2 changes: 1 addition & 1 deletion android/mordavokne/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {
implementation 'io.github.cppfw:papki:+'
implementation 'io.github.cppfw:r4:+'
implementation 'io.github.cppfw:morda:+'
implementation 'io.github.cppfw:morda-render-opengles:+'
implementation 'io.github.cppfw:ruis-render-opengles:+'
implementation 'io.github.cppfw:nitki:+'
}

Expand Down
2 changes: 1 addition & 1 deletion cocoapods/mordavokne.podspec.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ Pod::Spec.new do |s|
s.dependency 'morda', '>= 0.5.195'
s.dependency 'papki', '>= 1.0.93'
s.dependency 'r4', '>= 0.1.53'
s.dependency 'morda-render-opengles', '>= 0.1.37'
s.dependency 'ruis-render-opengles', '>= 0.1.37'
end
4 changes: 2 additions & 2 deletions debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Build-Depends:
libr4-dev (>= 0.1.53),
libglew-dev,
libnitki-dev (>= 1.0.41),
libmorda-render-opengl-dev (>= 0.1.46),
libmorda-render-opengles-dev (>= 0.1.37),
libruis-render-opengl-dev (>= 0.1.46),
libruis-render-opengles-dev (>= 0.1.37),
libegl1-mesa-dev,
libgles2-mesa-dev,
libgtk-3-dev
Expand Down
2 changes: 1 addition & 1 deletion doc/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ include prorab.mk
include prorab-doxygen.mk

this_out_dir := out
this_name := mordavokne
this_name := ruisapp

$(eval $(prorab-build-doxygen))
8 changes: 4 additions & 4 deletions examples/basic/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ endif

ifeq ($(prorab_os),windows)
this_ldlibs += -lmingw32 #these should go first, otherwise linker will complain about undefined reference to WinMain
# this_ldlibs += $(prorab_this_dir)../../src/libmorda$(prorab_lib_extension)
# this_ldlibs += $(prorab_this_dir)../../src/libruis$(prorab_lib_extension)
this_ldflags += -L/usr/lib -L/usr/local/lib
this_ldlibs += -lglew32 -lopengl32 -lz -lfreetype -mwindows

Expand All @@ -32,13 +32,13 @@ ifeq ($(prorab_os),windows)
this_cxxflags += -D__STDC_FORMAT_MACROS
else ifeq ($(prorab_os),macosx)
this_ldlibs += -lGLEW -framework OpenGL -framework Cocoa -lfreetype
this_ldlibs += -lmordavokne
this_ldlibs += -lruisapp
else ifeq ($(prorab_os),linux)
this_ldlibs += -lGLEW -pthread -lGL
this_ldlibs += `pkg-config mordavokne-opengl2 --libs`
this_ldlibs += `pkg-config ruisapp-opengl2 --libs`
endif

this_ldlibs += -lnitki -lopros -lstob -lmorda -lstdc++
this_ldlibs += -lnitki -lopros -lstob -lruis -lstdc++



Expand Down
2 changes: 1 addition & 1 deletion homebrew/mordavokne.rb.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Mordavokne < Formula
depends_on "glew"
depends_on "libr4"
depends_on "libmorda"
depends_on "libmorda-render-opengl"
depends_on "libruis-render-opengl"

# use gmake here because otherwise homebrew uses default Mac's make which is of too old version 3.81
def install
Expand Down
2 changes: 1 addition & 1 deletion msys2/PKGBUILD.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ url="http://github.com/cppfw/${packageName}"
license=('MIT')
groups=()

depends=("${pkgPrefix}morda" "${pkgPrefix}morda-render-opengl")
depends=("${pkgPrefix}morda" "${pkgPrefix}ruis-render-opengl")

# 'clang-tools-extra' for clang-tidy
makedepends=('myci' 'prorab' 'prorab-extra' 'doxygen' "${pkgPrefix}clang-tools-extra")
Expand Down
2 changes: 1 addition & 1 deletion nuget/nuget.autopkg.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ nuget{
packages : {
libr4/0.1.53;
libmorda/0.5.163;
libmorda-render-opengl/0.1.46;
libruis-render-opengl/0.1.46;
glew.v140/1.12.0;
libpapki/1.0.93;
libopros/1.0.46;
Expand Down
16 changes: 8 additions & 8 deletions src/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include prorab-license.mk
include prorab-linux.mk
include prorab-clang-format.mk

define mordavokne_rules
define ruisapp_rules

$$(eval $$(call prorab-config, ../config))

Expand All @@ -26,13 +26,13 @@ define mordavokne_rules
this_ldlibs += -framework Cocoa -framework OpenGL -ldl
endif

this_ldlibs += -lmorda -lpapki -ltreeml -lutki
this_ldlibs += -lruis -lpapki -ltreeml -lutki

ifeq ($(os), macosx)
this_mm_obj := $$(d)$$(this_out_dir)obj_$$(this_name)/objc/mordavokne/glue/macosx/glue.mm.o
this_mm_obj := $$(d)$$(this_out_dir)obj_$$(this_name)/objc/ruisapp/glue/macosx/glue.mm.o

define this_subrules
$$(this_mm_obj): $$(d)mordavokne/glue/macosx/glue.mm
$$(this_mm_obj): $$(d)ruisapp/glue/macosx/glue.mm
$(.RECIPEPREFIX)@echo compile $$$$<...
$(.RECIPEPREFIX)$(a)mkdir -p $$$$(dir $$$$@)
$(.RECIPEPREFIX)$(a)$(this_cc) -ObjC++ -c -o "$$$$@" $$(this_cxxflags) $$(OBJCXXFLAGS) $$ $$$$<
Expand All @@ -42,7 +42,7 @@ $(.RECIPEPREFIX)$(a)$(this_cc) -ObjC++ -c -o "$$$$@" $$(this_cxxflags) $$(OBJCXX
endif

this_cxxflags += -DMORDAVOKNE_RENDER_$(shell echo $1 | tr '[:lower:]' '[:upper:]')
this_ldlibs += -lmorda-render-$1
this_ldlibs += -lruis-render-$1

ifeq ($1,opengles)
ifeq ($(prorab_linux),raspbian)
Expand All @@ -64,14 +64,14 @@ $(.RECIPEPREFIX)$(a)$(this_cc) -ObjC++ -c -o "$$$$@" $$(this_cxxflags) $$(OBJCXX
$$(eval $$(prorab-clear-this-vars))
endef

$(eval $(call mordavokne_rules,opengl))
$(eval $(call ruisapp_rules,opengl))

ifeq ($(os), linux)
$(eval $(call mordavokne_rules,opengles))
$(eval $(call ruisapp_rules,opengles))
endif

# clear variable
mordavokne_rules :=
ruisapp_rules :=

this_license_file := ../LICENSE
this_src_dir := .
Expand Down
14 changes: 7 additions & 7 deletions tests/app/makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include prorab.mk
include prorab-test.mk

this_name := mordavokne-test
this_name := ruisapp-test

$(eval $(call prorab-config, ../../config))

Expand All @@ -10,14 +10,14 @@ this_srcs += $(call prorab-src-dir, src)
this_cxxflags += -isystem ../../src

ifeq ($(ogles2), true)
this_mordavoknelib := libmordavokne-opengles
this_libruisapp := libruisapp-opengles
else
this_mordavoknelib := libmordavokne-opengl
this_libruisapp := libruisapp-opengl
endif

this_mordavoknelib := ../../src/out/$(c)/$(this_mordavoknelib)$(dot_so)
this_libruisapp := ../../src/out/$(c)/$(this_libruisapp)$(dot_so)

this_ldlibs += $(this_mordavoknelib)
this_ldlibs += $(this_libruisapp)

ifeq ($(os),windows)
this_ldlibs += -lmingw32 # these should go first, otherwise linker will complain about undefined reference to WinMain
Expand All @@ -30,11 +30,11 @@ else ifeq ($(os),linux)
this_ldflags += -rdynamic
endif

this_ldlibs += -ltreeml -lmorda -lutki -lpapki -lm
this_ldlibs += -ltreeml -lruis -lutki -lpapki -lm

$(eval $(prorab-build-app))

$(eval $(call prorab-depend, $(prorab_this_name), $(this_mordavoknelib)))
$(eval $(call prorab-depend, $(prorab_this_name), $(this_libruisapp)))

this_run_name := app
this_test_cmd := $(prorab_this_name)
Expand Down
2 changes: 1 addition & 1 deletion tests/app/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ class application : public ruisapp::application{
return wp;
}())
{
this->gui.init_standard_widgets(*this->get_res_file("../../res/morda_res/"));
this->gui.init_standard_widgets(*this->get_res_file("../../res/ruis_res/"));

this->gui.context.get().loader.mount_res_pack(*this->get_res_file("res/"));
// this->ResMan().MountResPack(ruis::ZipFile::New(papki::FSFile::New("res.zip")));
Expand Down
2 changes: 1 addition & 1 deletion xcode/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ target "mordavokne" do
pod 'r4', '>= 0.1.53'
pod 'treeml', '>= 0.1.28'
pod 'morda', '>= 0.5.195'
pod 'morda-render-opengles', '>= 0.1.37'
pod 'ruis-render-opengles', '>= 0.1.37'
end

0 comments on commit 3ca5acd

Please sign in to comment.